From 090b71ef6414c07e13f67e7619699449a185260b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 01:34:48 -0200 Subject: netsurf-libre: fix building issue --- libre/netsurf-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD index 0bcb5e021..f3ade8253 100644 --- a/libre/netsurf-libre/PKGBUILD +++ b/libre/netsurf-libre/PKGBUILD @@ -116,7 +116,7 @@ build() { package() { cd "$_pkgname-$pkgver" - make install PREFIX=/usr DESTDIR="$pkgdir" + make install PREFIX=/usr DESTDIR="$pkgdir" NETSURF_USE_WEBP=YES mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf" install -Dm755 "../$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" install -Dm644 "../$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png" -- cgit v1.2.3 From 3dfcf64b06152e75fa14bad0db552f4d12249e9e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 01:37:39 -0200 Subject: wine-libre-1.7.11-1.1: fix bug #485 => https://labs.parabola.nu/issues/485 --- libre-multilib/wine-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre-multilib/wine-libre/PKGBUILD b/libre-multilib/wine-libre/PKGBUILD index d43177b74..abe419845 100644 --- a/libre-multilib/wine-libre/PKGBUILD +++ b/libre-multilib/wine-libre/PKGBUILD @@ -8,7 +8,7 @@ _pkgname=wine pkgname=wine-libre pkgver=1.7.11 -pkgrel=1 +pkgrel=1.1 _pkgbasever=${pkgver/rc/-rc} @@ -101,6 +101,8 @@ else replaces+=('bin32-wine') fi +depends=(${_depends[@]}) + build() { cd "$srcdir" @@ -154,8 +156,6 @@ build() { } package() { - depends=(${_depends[@]}) - msg2 "Packaging Wine-32..." cd "$srcdir/$_pkgname-32-build" -- cgit v1.2.3 From cd3b9be055d29c5258e3df8034e74b6c34332d44 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 02:02:02 -0200 Subject: pidgin-nonprism: remove deprecated patch --- ...ix-login-issues-with-certain-xmpp-servers.patch | 145 --------------------- 1 file changed, 145 deletions(-) delete mode 100644 nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch diff --git a/nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch b/nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch deleted file mode 100644 index 32f28aa25..000000000 --- a/nonprism/pidgin-nonprism/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch +++ /dev/null @@ -1,145 +0,0 @@ - -# HG changeset patch -# User Mark Doliner -# Date 1391153359 28800 -# Node ID b8e2a5fbffd3052ccba7160b56eac70f8e19c49a -# Parent e733020a9d3840275ffa931a9aeefe4d8befc08e -Fix problems logging into some servers including jabber.org and -chat.facebook.com. - -See my length comment in iq.c for details. - -diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c ---- a/libpurple/protocols/jabber/iq.c -+++ b/libpurple/protocols/jabber/iq.c -@@ -283,6 +283,52 @@ - g_hash_table_remove(js->iq_callbacks, id); - } - -+/** -+ * Verify that the 'from' attribute of an IQ reply is a valid match for -+ * a given IQ request. The expected behavior is outlined in section -+ * 8.1.2.1 of the XMPP CORE spec (RFC 6120). We consider the reply to -+ * be a valid match if any of the following is true: -+ * - Request 'to' matches reply 'from' (including the case where -+ * neither are set). -+ * - Request 'to' was empty and reply 'from' is server JID. -+ * - Request 'to' was empty and reply 'from' is my JID. The spec says -+ * we should only allow bare JID, but we also allow full JID for -+ * compatibility with some servers. -+ * -+ * These rules should allow valid IQ replies while preventing spoofed -+ * ones. -+ * -+ * For more discussion see the "Spoofing of iq ids and misbehaving -+ * servers" email thread from January 2014 on the jdev and security -+ * mailing lists. -+ * -+ * @return TRUE if this reply is valid for the given request. -+ */ -+static gboolean does_reply_from_match_request_to(JabberStream *js, JabberID *to, JabberID *from) -+{ -+ if (jabber_id_equal(to, from)) { -+ /* Request 'to' matches reply 'from' */ -+ return TRUE; -+ } -+ -+ if (!to && purple_strequal(from->domain, js->user->domain)) { -+ /* Request 'to' is empty and reply 'from' domain matches our domain */ -+ -+ if (!from->node && !from->resource) { -+ /* Reply 'from' is server bare JID */ -+ return TRUE; -+ } -+ -+ if (purple_strequal(from->node, js->user->node) -+ && (!from->resource || purple_strequal(from->resource, js->user->resource))) { -+ /* Reply 'from' is my full or bare JID */ -+ return TRUE; -+ } -+ } -+ -+ return FALSE; -+} -+ - void jabber_iq_parse(JabberStream *js, xmlnode *packet) - { - JabberIqCallbackData *jcd; -@@ -377,8 +423,9 @@ - - /* First, lets see if a special callback got registered */ - if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) { -- if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) { -- if(jabber_id_equal(js, jcd->to, from_id)) { -+ jcd = g_hash_table_lookup(js->iq_callbacks, id); -+ if (jcd) { -+ if (does_reply_from_match_request_to(js, jcd->to, from_id)) { - jcd->callback(js, from, type, id, packet, jcd->data); - jabber_iq_remove_callback_by_id(js, id); - jabber_id_free(from_id); -diff --git a/libpurple/protocols/jabber/jutil.c b/libpurple/protocols/jabber/jutil.c ---- a/libpurple/protocols/jabber/jutil.c -+++ b/libpurple/protocols/jabber/jutil.c -@@ -510,30 +510,21 @@ - - - gboolean --jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2) -+jabber_id_equal(const JabberID *jid1, const JabberID *jid2) - { -- const JabberID *j1, *j2; -- JabberID *bare_user_jid; -- gboolean equal; -+ if (!jid1 && !jid2) { -+ /* Both are null therefore equal */ -+ return TRUE; -+ } - -- /* If an outgoing stanza has no 'to', or an incoming has no 'from', -- * then those are "the server acting as my account". This function will -- * handle that correctly. -- */ -- if (!jid1 && !jid2) -- return TRUE; -+ if (!jid1 || !jid2) { -+ /* One is null, other is non-null, therefore not equal */ -+ return FALSE; -+ } - -- bare_user_jid = jabber_id_to_bare_jid(js->user); -- j1 = jid1 ? jid1 : bare_user_jid; -- j2 = jid2 ? jid2 : bare_user_jid; -- -- equal = purple_strequal(j1->node, j2->node) && -- purple_strequal(j1->domain, j2->domain) && -- purple_strequal(j1->resource, j2->resource); -- -- jabber_id_free(bare_user_jid); -- -- return equal; -+ return purple_strequal(jid1->node, jid2->node) && -+ purple_strequal(jid1->domain, jid2->domain) && -+ purple_strequal(jid1->resource, jid2->resource); - } - - char *jabber_get_domain(const char *in) -diff --git a/libpurple/protocols/jabber/jutil.h b/libpurple/protocols/jabber/jutil.h ---- a/libpurple/protocols/jabber/jutil.h -+++ b/libpurple/protocols/jabber/jutil.h -@@ -46,12 +46,10 @@ - JabberID* jabber_id_new(const char *str); - - /** -- * Compare two JIDs for equality. -- * -- * Warning: If either JID is NULL then this function uses the user's -- * bare JID, instead! -+ * Compare two JIDs for equality. In addition to the node and domain, -+ * the resources of the two JIDs must also be equal (or both absent). - */ --gboolean jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2); -+gboolean jabber_id_equal(const JabberID *jid1, const JabberID *jid2); - - void jabber_id_free(JabberID *jid); - - -- cgit v1.2.3 From 943c58644312cad8e1a48cf019c429ce5c5a73f8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 02:29:58 -0200 Subject: icedove-libre-1:24.2.0.deb1-1: updating version --- libre/icedove-libre/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 9409190c8..e57c9b204 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer : Márcio Silva # Maintainer : André Silva -# We're getting this from Debian Experimental +# We're getting this from Debian Sid _debname=icedove -_debver=24.1.1 +_debver=24.2.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -16,7 +16,7 @@ pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -url="http://packages.debian.org/experimental/${_pkgname}" +url="http://packages.debian.org/sid/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') @@ -30,8 +30,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" vendor.js ${_pkgname}.desktop) options=(!emptydirs) -md5sums=('91ddfb44481e6cb456d835a832d885c1' - '9f060324dbed3f8d27c896703bda6078' +md5sums=('76adf0c422339e79c550d2901a48b30b' + '338c4b16319623ea27fe6e33ea81335e' 'c46cf2a671c8fdefcabd4c87e38f3d40' '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') -- cgit v1.2.3 From 2af04a18806aabf8eec6b6ed54b75a7a718cce15 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 02:30:17 -0200 Subject: icedove-l10n-1:24.2.0.deb1-1: updating version --- libre/icedove-l10n/PKGBUILD | 116 ++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 423b11d2a..fdf88e82d 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=icedove-l10n epoch=1 -_pkgver=24.1.1 -pkgver=24.1.1.deb1 +_pkgver=24.2.0 +pkgver=24.2.0.deb1 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) @@ -15,7 +15,7 @@ pkgname=($(for lang in ${_langpacks[@]} pkgrel=1 pkgdesc="Language packs for Debian Icedove." arch=('any') -url="http://packages.debian.org/experimental/icedove" +url="http://packages.debian.org/sid/icedove" license=('MPL' 'GPL') depends=("icedove-libre>=$epoch:$pkgver") makedepends=('unzip' 'zip') @@ -65,58 +65,58 @@ done md5sums=('d5b2567a8cc8f64591f313a6efdaaffc' 'f3719964e893c1002b7a923e8f95f923' - '71b52e9b2ea4b2813579151107b26d7c' - '0001f92a0a732b2d8d4abe5b73739871' - '0ca3fd860debb0f4bea75c295cd794bf' - '3fa1b7e34efb29fcf12ff84c9b7cfb99' - '0d412e040d7db1bff6ba7a5901c194a3' - '196390a5683708ea9d1dff08d5da4969' - '1b580efd13589da4a7c700ce675b4de8' - '3f0b570ace30f4b8439328f63424914a' - '5d7890dce639c703319185dcca099c19' - '02352099e2bb79b9ed57b8b735d1b662' - '1b463b18db5640f9fb1fbb82f9862d51' - 'f8053c0d509c95643be7c993f79469e8' - 'c7286e9fb549480c7565947162473eb3' - 'a180d36ebe0e04a452c452d8ca249936' - 'faa9054e681927eec112b989b9b9f916' - 'd5b4bbe5cd18b72b7d8c649b68a095bb' - '5fd037b2d60ff663eccbf0788a52cce7' - '824805de27a69e5323c6e547974c6c02' - '6a3e55d20d4945ead133054127b1ba17' - '81db405732d6b5e6fd057505be5b03c1' - '25338963e6cbf51ea9c18bc7bd786a44' - 'bfc2a548805ba54bb81d8deaa5fcf406' - 'da5d4edacaf56bbb015987b334c49a46' - '264aa5440cd50dd1d09b1f6c682dde95' - '1a671a227b2713f0d7ede3b8c547e003' - '4dfce580e8d6f889ef868cf1a85ddd89' - 'cded11a2ee85f1bfa704a8bcfd7063ac' - 'ca08979c98adc6b1c1086c1bf037d64a' - '6d433d1b6395957c9c16eb9efe79c461' - '412186cd09492af191ef5b8e5523997b' - '9f5f15ba89ed4a7dd82b973616a84fb1' - 'ff817ed985260ba5b2284d70ede97cfc' - 'c6474a9d0a49b177b8d1daca5e3faf54' - '81f1379b774a9762918b5bb6fd613a94' - 'dfb5c1393033518e12ae9ff91afeed97' - '24383d610a424cc71c44b9fa923b9743' - 'c5918f13d25dd124ed8050b7177a6adf' - '76ec5c28687220f39bac18fd2381ab29' - '03263f5ebc6e38022c808689ff0f848c' - 'aaa66545fb46d23ea0b5537495b0c08e' - '5e105d2fd7ad811f3afbe375ab8ef293' - '955a91d8b73bd14f12afa4be13a45bca' - 'dbd1a1b2ea0777d1df361f973d53c27e' - '03f0558bcbc1dafa4b29bcf1a69ca170' - 'd1a58f928165c099c01b8687e92889af' - 'a8b3385d0c7679b871cf9bcaf406ca26' - '2fbeac1775ab8ce9096ee14d628c68e8' - '450ac4b6e744b7ed8cd92e9852d0e80f' - '31c56ec4e6de175c75b60e421f1381fc' - '43d1335568bc7b6806ed5151e7b38243' - 'eaece7103da2f8b19967d5f4b5e7befc' - '9b3abcfb1ccac0b863dcde99ab487d71' - '343fcfdec8f55f2e227bb5e1a5804907' - 'ee9931bb007f935c0aaa16031c4319e7' - 'ee92083eea883b10946cee46ac529d21') + '2450e9b3a3f7b263dffba2b565caa026' + 'c8a34d460bbcf6095816787341a83bd3' + '9718159572dfa8318dd01a9a63a44b24' + 'b86442f249fe530e3e3e97444c559a7b' + 'd1d7f1bec25dd183aea62dd46b6b845f' + '425eb82e0cc734477fcb1f5eaca3a0b8' + 'd2a1f926448d9205fc2a9a113118c8f7' + '9e8afc1b6bf49f77e78462844745eabb' + '05c7362d95f6c1b8d4ab401b93d4dd26' + 'e3c7a12c3cd115f89472e714de9bbd96' + '511a967c932cd737f2c163d435c160b2' + '938095a514e39ca8058b894f7e285cdc' + '827e21a03cd9c99e9cb70e54b43cd28d' + '97aed07198d724ed2ff2f776cea9a694' + '393c678ac00c636096dc9d826fa99094' + 'a2ea99fb8bea0c81323f71987734fa75' + '7fa2aefd207d0830ec7d14f82d114b0e' + '3755689abeca519609029e0feb546861' + '239e1f4065d0027a09f4918fea2caebb' + '62d148305f8c146c6aeb7e46a91fb9dc' + '4cf85b9d988af5cf0dbbe60f33c78f8b' + 'ff3674d6422b3c6714dbbb604e830949' + '6b3c1eeb2a08f23e62865dd0890c7de2' + '4542f05f58a3f3fcc10fe2bee7bce620' + 'eabd4446b149be7abfb6ebdf2f0f9d17' + 'e2a4cae3125def4d5d02de6e39694d42' + '17423b845de2a30f4ce613399032e475' + '4a3227bc8cedbab2557dfddf193dadee' + 'e52d3c3a7e85af431aa78b5a172ca204' + '2ea44ef074d6c0126c11f1cf58119ea1' + '51f41c4bfc2651d59512401e6aef1a97' + 'b9ae7913f935a3a75fc4d35f54d229e2' + '2b65b7ca0445d9fd3030fc92922c9fef' + '4bd83ca6cc1eba3110be638f0b4ba58e' + '6f31e8349b4690d4364726fecd151c84' + 'bb8616d3f3beaf1c1b412d712a8191fd' + '8353b8ed0349460ff9006d1dc2e907f4' + 'cbc9d67c7c46a14517925674c7ce9241' + '10e9f12b915261a091f1e9a7aa3c491a' + '047ad48b03c91e0c4f59a828e34fe216' + 'ba6d3760ab01715b38f8c48c2c90c4e5' + '1acb8648f3efc1255472dd6161167467' + 'f2473203871f1d3db4c6930fea44d2bc' + '4e5506496329c9adb12271aa0237e437' + '81d7d92335e5bbd31265d4dd56017a03' + '30dd5472ec45558305661ba767450ee6' + 'ba42b92642b38e40d442f520d022d2cb' + '92ca20bf2065b5889de8811989600b37' + '2d64d71fca6e4e14ecea0d3e51ef7898' + '763a383781ccd499011c975936538222' + '37476f33e304615105374f11f7af6bcc' + '0905709db25a5566b0ef7507dcca96a9' + '832103f16211936217690e734556e95c' + 'ff4a8836c4086c22174bcdc6839468fa' + '6dfa0de1e9731226ff0c85386b100ccb') -- cgit v1.2.3 From 334f70a0414397f5ba4fd7e56ee440ad107531c5 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 02:30:41 -0200 Subject: icedove-libre-nonprism-1:24.2.0.deb1-1: updating version --- nonprism/icedove-libre-nonprism/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD index 196536ea0..04a6a4297 100644 --- a/nonprism/icedove-libre-nonprism/PKGBUILD +++ b/nonprism/icedove-libre-nonprism/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer : Márcio Silva # Maintainer : André Silva -# We're getting this from Debian Experimental +# We're getting this from Debian Sid _debname=icedove -_debver=24.1.1 +_debver=24.2.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -16,7 +16,7 @@ pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -url="http://packages.debian.org/experimental/${_pkgname}" +url="http://packages.debian.org/sid/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') @@ -30,8 +30,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" vendor.js ${_pkgname}.desktop) options=(!emptydirs) -md5sums=('91ddfb44481e6cb456d835a832d885c1' - '9f060324dbed3f8d27c896703bda6078' +md5sums=('76adf0c422339e79c550d2901a48b30b' + '338c4b16319623ea27fe6e33ea81335e' 'c46cf2a671c8fdefcabd4c87e38f3d40' '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') -- cgit v1.2.3 From 850812406caf279a4ab51af60cc43b83f4f77a55 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 14:06:58 -0200 Subject: icedove-libre: remove libnotify dependency; not used anymore => https://bugzilla.mozilla.org/show_bug.cgi?id=853104 --- libre/icedove-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index e57c9b204..1d7847246 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -17,7 +17,7 @@ pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader base arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/sid/${_pkgname}" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') replaces=('thunderbird') -- cgit v1.2.3 From ea13acdb2af86419b66377a3564e72797e9e157b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 14:07:38 -0200 Subject: icedove-libre-nonprism: remove libnotify dependency; not used anymore => https://bugzilla.mozilla.org/show_bug.cgi?id=853104 --- nonprism/icedove-libre-nonprism/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD index 04a6a4297..8913583ec 100644 --- a/nonprism/icedove-libre-nonprism/PKGBUILD +++ b/nonprism/icedove-libre-nonprism/PKGBUILD @@ -17,7 +17,7 @@ pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader base arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/sid/${_pkgname}" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') replaces=('thunderbird' "${pkgname%-nonprism}") -- cgit v1.2.3 From 16f3677384ce07c5390cb9d4e5cda6dce47e36fc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 15:03:16 -0200 Subject: repackage to fix trouble installing because was discovered that our rebranded packages on [libre] were the official Arch packages from [core], maybe a db-sync bug --- libre/filesystem/PKGBUILD | 2 +- libre/gummiboot/PKGBUILD | 2 +- libre/hardinfo/PKGBUILD | 4 ++-- libre/lsb-release/PKGBUILD | 2 +- libre/mkisolinux/PKGBUILD | 2 +- libre/mkpxelinux/PKGBUILD | 2 +- libre/mksyslinux/PKGBUILD | 2 +- libre/psi/PKGBUILD | 2 +- libre/reflector/PKGBUILD | 2 +- libre/syslinux/PKGBUILD | 2 +- libre/usermin/PKGBUILD | 2 +- libre/webmin/PKGBUILD | 2 +- libre/xsp/PKGBUILD | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 00be19b0a..9cb060ecc 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -5,7 +5,7 @@ pkgname=filesystem pkgver=2013.05 -pkgrel=2 +pkgrel=2.1 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index 85804c9c0..a1814bd71 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -7,7 +7,7 @@ pkgname="gummiboot" pkgver="43" -pkgrel="2" +pkgrel="2.1" pkgdesc="Simple UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" arch=('x86_64' 'i686' 'mips64el') diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD index 1987e191e..2de9e5887 100644 --- a/libre/hardinfo/PKGBUILD +++ b/libre/hardinfo/PKGBUILD @@ -4,8 +4,8 @@ pkgname=hardinfo pkgver=0.5.1 -pkgrel=5 -pkgdesc="A system information and benchmark tool." +pkgrel=5.1 +pkgdesc="A system information and benchmark tool (Parabola rebranded)" arch=('i686' 'x86_64') url="http://hardinfo.berlios.de/wiki/index.php/Main_Page" license=('GPL2') diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD index 6f761a81f..8f33e7ba3 100644 --- a/libre/lsb-release/PKGBUILD +++ b/libre/lsb-release/PKGBUILD @@ -7,7 +7,7 @@ pkgname=lsb-release pkgver=1.4 -pkgrel=14 +pkgrel=14.1 pkgdesc="LSB version query program (Parabola rebranded)" arch=('any') url="http://www.linuxbase.org/" diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD index 7c9ab6cc4..e2900d521 100644 --- a/libre/mkisolinux/PKGBUILD +++ b/libre/mkisolinux/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mkisolinux pkgver=2013.05 -pkgrel=1 +pkgrel=1.1 pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)" arch=(any) license=('GPL') diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD index b3a94547f..5596983b0 100644 --- a/libre/mkpxelinux/PKGBUILD +++ b/libre/mkpxelinux/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mkpxelinux pkgver=2013.10 -pkgrel=1 +pkgrel=1.1 pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)" arch=(any) license=('GPL') diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD index a64f141fd..f01c844a9 100644 --- a/libre/mksyslinux/PKGBUILD +++ b/libre/mksyslinux/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mksyslinux pkgver=2013.06 -pkgrel=1 +pkgrel=1.1 pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)" arch=(any) license=('GPL') diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD index e37c37f05..69ac930b0 100644 --- a/libre/psi/PKGBUILD +++ b/libre/psi/PKGBUILD @@ -4,7 +4,7 @@ pkgname=psi pkgver=0.15 -pkgrel=2 +pkgrel=2.1 pkgdesc='Instant messaging application designed for the Jabber IM (Parabola rebranded)' url='http://psi-im.org/' license=('GPL') diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD index dda93c171..c8bc6bd5e 100644 --- a/libre/reflector/PKGBUILD +++ b/libre/reflector/PKGBUILD @@ -2,7 +2,7 @@ #Maintainer (Parabola): André Silva pkgname=reflector pkgver=2014 -pkgrel=2 +pkgrel=2.1 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)' arch=(any) license=(GPL) diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 234f7a43f..6b3b53b77 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -5,7 +5,7 @@ pkgname="syslinux" pkgver="6.02" -pkgrel="8" +pkgrel="8.1" arch=('x86_64' 'i686') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD index 5344a65c2..5613daba3 100644 --- a/libre/usermin/PKGBUILD +++ b/libre/usermin/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski pkgname=usermin pkgver=1.570 -pkgrel=1 +pkgrel=1.1 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:usermin') diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index 17d02e437..824c7da2b 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski pkgname=webmin pkgver=1.660 -pkgrel=1 +pkgrel=1.1 pkgdesc="a web-based interface for system administration (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:webmin') diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD index 02e172c8f..ef6fe97c2 100644 --- a/libre/xsp/PKGBUILD +++ b/libre/xsp/PKGBUILD @@ -4,7 +4,7 @@ pkgname=xsp pkgver=3.0.11 -pkgrel=1 +pkgrel=1.1 pkgdesc="A simple webserver based on mono - provides ASP.NET support (Parabola rebranded)" arch=('i686' 'x86_64' 'mips64el') license=('custom') -- cgit v1.2.3 From 4ec682e4d546b1ec24049b114103e443489efd95 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 15:11:19 -0200 Subject: enscript: remove from [libre] because freedom issue on Arch was solved --- libre/enscript/PKGBUILD | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 libre/enscript/PKGBUILD diff --git a/libre/enscript/PKGBUILD b/libre/enscript/PKGBUILD deleted file mode 100644 index 281675296..000000000 --- a/libre/enscript/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 150464 2012-02-18 00:24:06Z allan $ -# Maintainer: Paul Mattal -# Contributor: Tom Newsom - -pkgname=enscript -pkgver=1.6.6 -pkgrel=1 -pkgdesc="Convert ASCII files to PostScript suitable for printing" -arch=('i686' 'x86_64' 'mips64el') -backup=('etc/enscript/enscript.cfg') -depends=('glibc') -license=('GPL2' 'custom') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('3acc242b829adacabcaf28533f049afd') -url="http://git.savannah.gnu.org/cgit/enscript.git" - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc/enscript --mandir=/usr/share/man \ - --infodir=/usr/share/info - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr \ - sysconfdir=$pkgdir/etc/enscript mandir=$pkgdir/usr/share/man \ - infodir=$pkgdir/usr/share/info install - install -D -m644 afm/MustRead.html "${pkgdir}/usr/share/licenses/${pkgname}/MustRead.html" -} - -# vim: ts=2 sw=2 et ft=sh -- cgit v1.2.3 From 612387f4d9af2ad1f4ac4bd070ab1ab3cd1651d4 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 16:22:18 -0200 Subject: add vim and gvim on [libre] temporally until new version because trouble installing vim-runtime package --- libre/vim/PKGBUILD | 227 +++++++++++++++++++++++++++++++++++++++++++++++++ libre/vim/gvim.desktop | 63 ++++++++++++++ libre/vim/gvim.install | 11 +++ libre/vim/parabola.vim | 27 ++++++ libre/vim/vimrc | 16 ++++ 5 files changed, 344 insertions(+) create mode 100644 libre/vim/PKGBUILD create mode 100644 libre/vim/gvim.desktop create mode 100644 libre/vim/gvim.install create mode 100644 libre/vim/parabola.vim create mode 100644 libre/vim/vimrc diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD new file mode 100644 index 000000000..ed2252afd --- /dev/null +++ b/libre/vim/PKGBUILD @@ -0,0 +1,227 @@ +# Maintainer: Thomas Dziedzic +# Contributor: Jan "heftig" Steffens +# Contributor: tobias [ tobias at archlinux org ] +# Contributor: Daniel J Griffiths + +pkgbase=vim +pkgname=('vim' 'gvim' 'vim-runtime') +_topver=7.4 +_patchlevel=135 +__hgrev=de28b1568fc2 +_versiondir="vim${_topver//./}" +pkgver=${_topver}.${_patchlevel} +pkgrel=2.1 +arch=('i686' 'x86_64') +license=('custom:vim') +url="http://www.vim.org" +makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') +source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" + "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" + 'vimrc' + 'parabola.vim' + 'gvim.desktop') +md5sums=('be672ce2a929503412378c998fc3dc27' + 'SKIP' + '27820c2bdc34624674c561ae6476bc6a' + 'a8c21928eefd766e211f987879a9199c' + 'd90413bd21f400313a785bb4010120cd') + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1) + + __hgroot='http://vim.googlecode.com/hg/' + __hgrepo='vim' + __hgbranch='default' + + hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} + + pushd ${__hgrepo} + if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then + printf 'You are not building the latest revision!\n' + printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n" + fi + popd + + mv vim ${pkgname}-${pkgver} + find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \; + rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} + tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* + rm -r ${pkgname}-${pkgver} + + gpg --detach-sign ${pkgname}-${pkgver}.tar.xz + + scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/ + scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/ +} + +build() { + cp -a ${pkgname}-${pkgver} vim-build + + # define the place for the global (g)vimrc file (set to /etc/vimrc) + sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + + (cd vim-build/src && autoconf) + + cp -a vim-build gvim-build + + cd "${srcdir}"/vim-build + + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Parabola GNU/Linux-libre' \ + --enable-gpm \ + --enable-acl \ + --with-x=no \ + --disable-gui \ + --enable-multibyte \ + --enable-cscope \ + --disable-netbeans \ + --enable-perlinterp \ + --disable-pythoninterp \ + --disable-python3interp \ + --disable-rubyinterp \ + --disable-luainterp + + make + + cd "${srcdir}"/gvim-build + + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Parabola GNU/Linux-libre' \ + --enable-gpm \ + --enable-acl \ + --with-x=yes \ + --enable-gui=gtk2 \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp \ + --enable-pythoninterp \ + --disable-python3interp \ + --enable-rubyinterp \ + --enable-luainterp + + make +} + +check() { + # disable tests because they seem to freeze + + cd "${srcdir}"/vim-build + + #make test + + cd "${srcdir}"/gvim-build + + #make test +} + +package_vim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') + conflicts=('gvim') + + cd "${srcdir}"/vim-build + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + rm -f evim.1 # this does not make sense if we have no GUI + done + + # Runtime provided by runtime package + rm -r "${pkgdir}"/usr/share/vim + + # license + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} + +package_gvim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' + 'desktop-file-utils' 'gtk2' 'lua' 'python2') + provides=("vim=${pkgver}-${pkgrel}") + conflicts=('vim') + install=gvim.install + + cd "${srcdir}"/gvim-build + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + done + + # Move the runtime for later packaging + mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install + + # freedesktop links + install -Dm644 "${srcdir}"/gvim.desktop \ + "${pkgdir}"/usr/share/applications/gvim.desktop + install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png + + # license + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} + +package_vim-runtime() { + pkgdesc='Runtime for vim and gvim (Parabola rebranded)' + depends=('perl' 'gawk') + backup=('etc/vimrc') + + # Install the runtime split from gvim + install -dm755 "${pkgdir}"/usr/share + mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim + + # Don't forget logtalk.dict + install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \ + "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict + + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim + + # patch filetype.vim for better handling of pacman related files + sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ + "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim + sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ + "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim + + # rc files + install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc + install -Dm644 "${srcdir}"/parabola.vim \ + "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim + + # rgb.txt file + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ + "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt + + # license + install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt +} + +# vim:set sw=2 sts=2 et: diff --git a/libre/vim/gvim.desktop b/libre/vim/gvim.desktop new file mode 100644 index 000000000..675357da5 --- /dev/null +++ b/libre/vim/gvim.desktop @@ -0,0 +1,63 @@ +[Desktop Entry] +Name=Vi IMproved +Name[bg]=Vi Ðåäàêòîð +Name[ca]=Vi Millorat +Name[da]=Vi forbedret +Name[eo]=VIM +Name[et]=Täiustatud Vi (vim) +Name[fr]=Vi étendu (VIM) +Name[he]=רפושמ Vi +Name[hu]=Vi +Name[is]=Vi IMproved ritillinn +Name[it]=Vi iMproved +Name[no]=Vi IMproved (forbedret VI) +Name[pl]=Poprawiony VI (vim) +Name[ro]=VIM +Name[ru]=Улучшенный VI +Name[sk]=Vi IMpreved +Name[sl]=Izboljšani vi (vim) +Name[sv]=Förbättrad Vi +Name[zh_CN.GB2312]=改进的 Vi +Comment=Powerful text editor with scripting functions and macro recorder +Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè +Comment[ca]=Editor vi potent +Comment[cs]=Mocný textový editor vi +Comment[da]=En kraftig vi tekstbehandler +Comment[de]=Ein leistungsfähiger vi-Editor +Comment[el]=Πανίσχυρος διορθωτής vi +Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn +Comment[es]=Una versión mejorada del editor vi +Comment[et]=Võimas tekstiredaktor vi +Comment[fi]=Tehokas vi-tekstieditori +Comment[fr]=Éditeur vi puissant +Comment[gl]=Potente editor vi +Comment[he]=Vi המצועה בר ךרועה +Comment[hr]=Napredni vi uređivač +Comment[hu]=Vi szövegszerkesztő +Comment[is]=Öflug útgáfa vi ritilsins +Comment[it]=Un editor vi potenziato +Comment[ja]=強力なViエディタ +Comment[lt]=Galingas vi redaktorius +Comment[mk]=Моќен VI уредувач +Comment[nl]=Krachtige vi-editor +Comment[no]=En kraftig vi-redigerer +Comment[no_NY]=Kraftig vi-tekstredigeringsprogram +Comment[pl]=Edytor vi +Comment[pt]=Um poderoso editor de texto +Comment[ro]=Un editor de texte VI, puternic +Comment[ru]=Мощный текстовый редактор vi +Comment[sk]=Silný textový procesor vi +Comment[sl]=Zmogljivi urejevalnik vi +Comment[sr]=Moćni vi editor +Comment[sv]=En kraftfull texteditor +Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷ +Comment[tr]=Güçlü vi düzenleyicisi +Comment[uk]=Потужний редактор vi +Comment[zh_CN.GB2312]=功能强大的 vi 编辑器 +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=gvim -f %F +Icon=gvim +Type=Application +Terminal=false +X-XClassHintResName=VIM +Categories=Utility;TextEditor; diff --git a/libre/vim/gvim.install b/libre/vim/gvim.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/libre/vim/gvim.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/libre/vim/parabola.vim b/libre/vim/parabola.vim new file mode 100644 index 000000000..bc3c1f82e --- /dev/null +++ b/libre/vim/parabola.vim @@ -0,0 +1,27 @@ +" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults +" +" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] +" Maintainer for Parabola rebranding: André Silva [emulatorman funnychar parabola dot nu] +" +" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION +" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc + +" Normally we use vim-extensions. If you want true vi-compatibility +" remove change the following statements +set nocompatible " Use Vim defaults instead of 100% vi compatibility +set backspace=indent,eol,start " more powerful backspacing + +" Now we set some defaults for the editor +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time + +" Suffixes that get lower priority when doing tab completion for filenames. +" These are files we are not likely to want to edit or read. +set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc + + +if has('gui_running') + " Make shift-insert work like in Xterm + map + map! +endif diff --git a/libre/vim/vimrc b/libre/vim/vimrc new file mode 100644 index 000000000..fc67e7eb0 --- /dev/null +++ b/libre/vim/vimrc @@ -0,0 +1,16 @@ +" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just +" /usr/share/vim/vimfiles/parabola.vim) and sourced by the call to :runtime +" you can find below. If you wish to change any of those settings, you should +" do it in this file (/etc/vimrc), since parabola.vim will be overwritten +" everytime an upgrade of the vim packages is performed. It is recommended to +" make changes after sourcing parabola.vim since it alters the value of the +" 'compatible' option. + +" This line should not be removed as it ensures that various options are +" properly set to work with the Vim-related packages. +runtime! parabola.vim + +" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' +" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual +" and configure vim to your own liking! + -- cgit v1.2.3 From 57f52074941be81a76b5b96c784d207eac799d10 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 19:15:34 -0200 Subject: fix parabola-release problem --- libre/filesystem/PKGBUILD | 5 +++-- libre/lsb-release/PKGBUILD | 2 +- libre/lsb-release/lsb-release.install | 2 -- libre/psi/PKGBUILD | 4 ++-- libre/psi/parabola.patch | 5 +++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 9cb060ecc..69edeeb16 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -5,7 +5,7 @@ pkgname=filesystem pkgver=2013.05 -pkgrel=2.1 +pkgrel=2.2 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -52,7 +52,8 @@ package() { for f in gshadow shadow crypttab; do install -m600 ${srcdir}/${f} etc/ done - touch etc/arch-release + touch etc/parabola-release + ln -s parabola-release etc/arch-release install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD index 8f33e7ba3..c6cbe5863 100644 --- a/libre/lsb-release/PKGBUILD +++ b/libre/lsb-release/PKGBUILD @@ -7,7 +7,7 @@ pkgname=lsb-release pkgver=1.4 -pkgrel=14.1 +pkgrel=14.2 pkgdesc="LSB version query program (Parabola rebranded)" arch=('any') url="http://www.linuxbase.org/" diff --git a/libre/lsb-release/lsb-release.install b/libre/lsb-release/lsb-release.install index 62d404892..261df2a73 100644 --- a/libre/lsb-release/lsb-release.install +++ b/libre/lsb-release/lsb-release.install @@ -1,10 +1,8 @@ post_install() { - rm -f /etc/arch-release echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release } post_upgrade() { - rm -f /etc/arch-release sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release } diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD index 69ac930b0..c4150075f 100644 --- a/libre/psi/PKGBUILD +++ b/libre/psi/PKGBUILD @@ -4,7 +4,7 @@ pkgname=psi pkgver=0.15 -pkgrel=2.1 +pkgrel=2.2 pkgdesc='Instant messaging application designed for the Jabber IM (Parabola rebranded)' url='http://psi-im.org/' license=('GPL') @@ -15,7 +15,7 @@ install='psi.install' source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2" 'parabola.patch') md5sums=('aea15f17cf93e7cea52f305523f761be' - 'a641b77517c82c6e1f254d5595a25113') + '8a5c799ad8b6fd5310d4a849c324c82c') prepare() { cd ${srcdir}/psi-${pkgver} diff --git a/libre/psi/parabola.patch b/libre/psi/parabola.patch index cafe67fa1..9d41bffc4 100644 --- a/libre/psi/parabola.patch +++ b/libre/psi/parabola.patch @@ -25,7 +25,7 @@ }; enum OsFlags { -@@ -106,24 +90,7 @@ +@@ -106,24 +90,8 @@ QString file; QString name; } osInfo[] = { @@ -47,7 +47,8 @@ - - // many distros use the /etc/redhat-release for compatibility, so RedHat will be the last :) - { LinuxRedHat, OsUseFile, "/etc/redhat-release", "RedHat Linux" }, -+ { LinuxParabola, OsUseName, "/etc/arch-release", "Parabola GNU/Linux-libre" }, ++ { LinuxParabola, OsUseName, "/etc/parabola-release", "Parabola GNU/Linux-libre" }, ++ { LinuxParabola, OsUseFile, "/etc/parabola-release", "Parabola GNU/Linux-libre" }, { LinuxNone, OsUseName, "", "" } }; -- cgit v1.2.3 From 859ebf7583eac543c9ddf8af8b6c8884c9c10df3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 22:18:38 -0200 Subject: mesa-libcl-10.0.3-1: updating version --- libre/mesa-libcl/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 88c817dcd..198bcbcb5 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname _pkgflag=libre -pkgver=10.0.2 +pkgver=10.0.3 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library' url=http://${pkgbase}3d.sourceforge.net @@ -27,7 +27,7 @@ provides=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 -sha512sums=15741b916e6338645a28961fb7a731f8c2a33afe11e91c0bd144f9d9afca96837c9caf7fb2fd769aedbeba2b8b12443e7a7eb8ab6cd2270024308ca11e88ff24 +sha512sums=e864c4d63336977b2917d83926331163198d47023228cc71f47c67251f675102dbab4551e032aa1dfcb4cbda1f98f15ff4565acef54a33ed8c50af32f52a52da build() { cd $srcdir/${pkgbase^}-$pkgver -- cgit v1.2.3 From 30b9c3200914ec089fab9d079cac4e67c9cba55e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Feb 2014 22:20:03 -0200 Subject: lib32-mesa-libcl-10.0.3-1: updating version --- libre-multilib/lib32-mesa-libcl/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD index 77a06620d..1274f6340 100644 --- a/libre-multilib/lib32-mesa-libcl/PKGBUILD +++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=mesa _pkgname=libcl pkgname=lib32-$pkgbase-$_pkgname _pkgflag=libre -pkgver=10.0.2 -pkgrel=2 +pkgver=10.0.3 +pkgrel=1 pkgdesc='Mesa 3-D OpenCL library (32-bit)' url=http://${pkgbase}3d.sourceforge.net license=(MIT Khronos LGPL) @@ -29,7 +29,7 @@ provides=(lib32-$_pkgname-$_pkgflag lib32-$_pkgname lib32-opencl-nvidia lib32-op conflicts=(lib32-$_pkgname-$_pkgflag lib32-$_pkgname lib32-opencl-nvidia lib32-opencl-nvidia-304xx) replaces=(lib32-$_pkgname-$_pkgflag lib32-$_pkgname lib32-opencl-nvidia lib32-opencl-nvidia-304xx) source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 -sha512sums=15741b916e6338645a28961fb7a731f8c2a33afe11e91c0bd144f9d9afca96837c9caf7fb2fd769aedbeba2b8b12443e7a7eb8ab6cd2270024308ca11e88ff24 +sha512sums=e864c4d63336977b2917d83926331163198d47023228cc71f47c67251f675102dbab4551e032aa1dfcb4cbda1f98f15ff4565acef54a33ed8c50af32f52a52da build() { cd $srcdir/${pkgbase^}-$pkgver -- cgit v1.2.3