From cc8b193003edbf40ff7372c6a86550c28364700f Mon Sep 17 00:00:00 2001 From: Daniel Milewski Date: Wed, 28 Jan 2015 20:42:22 +0100 Subject: smartypants: add new package to [pcr] --- pcr/smartypants/PKGBUILD | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pcr/smartypants/PKGBUILD diff --git a/pcr/smartypants/PKGBUILD b/pcr/smartypants/PKGBUILD new file mode 100644 index 000000000..5f7f42d6d --- /dev/null +++ b/pcr/smartypants/PKGBUILD @@ -0,0 +1,30 @@ +# Contributor: Daniel Milewski + +pkgname=smartypants +pkgver=1.5.1 +pkgrel=1 +pkgdesc='Smart punctuation for web sites' +arch=(any) +url=http://daringfireball.net/projects/smartypants/ +license=(BSD) +depends=(perl) +makedepends=(unzip) +source=(http://daringfireball.net/projects/downloads/SmartyPants_$pkgver.zip) +sha256sums=(2813a12d8dd23f091399195edd7965e130103e439e2a14f298b75b253616d531) + +build() +{ + cd "$srcdir/SmartyPants_$pkgver" + + pod2man SmartyPants.pl > smartypants.1 + sed -n '/^Copyright (c)/,/damage\./p' 'SmartyPants Readme.txt' > LICENSE +} + +package() +{ + cd "$srcdir/SmartyPants_$pkgver" + + install -Dm 755 SmartyPants.pl "$pkgdir/usr/bin/smartypants" + install -Dm 644 smartypants.1 "$pkgdir/usr/share/man/man1/smartypants.1" + install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} -- cgit v1.2.3-54-g00ecf From 9109fbad5ccb3416f621957bd894180696d83c4f Mon Sep 17 00:00:00 2001 From: Daniel Milewski Date: Wed, 28 Jan 2015 20:54:36 +0100 Subject: vim-autotag: add new package to [pcr] --- pcr/vim-autotag/LICENSE | 288 +++++++++++++++++++++++++++++++++++++++++++++++ pcr/vim-autotag/PKGBUILD | 35 ++++++ 2 files changed, 323 insertions(+) create mode 100644 pcr/vim-autotag/LICENSE create mode 100644 pcr/vim-autotag/PKGBUILD diff --git a/pcr/vim-autotag/LICENSE b/pcr/vim-autotag/LICENSE new file mode 100644 index 000000000..113df4f64 --- /dev/null +++ b/pcr/vim-autotag/LICENSE @@ -0,0 +1,288 @@ +*uganda.txt* For Vim version 7.4. Last change: 2013 Jul 06 + + + VIM REFERENCE MANUAL by Bram Moolenaar + + + *uganda* *Uganda* *copying* *copyright* *license* +SUMMARY + *iccf* *ICCF* +Vim is Charityware. You can use and copy it as much as you like, but you are +encouraged to make a donation for needy children in Uganda. Please see |kcc| +below or visit the ICCF web site, available at these URLs: + + http://iccf-holland.org/ + http://www.vim.org/iccf/ + http://www.iccf.nl/ + +You can also sponsor the development of Vim. Vim sponsors can vote for +features. See |sponsor|. The money goes to Uganda anyway. + +The Open Publication License applies to the Vim documentation, see +|manual-copyright|. + +=== begin of license === + +VIM LICENSE + +I) There are no restrictions on distributing unmodified copies of Vim except + that they must include this license text. You can also distribute + unmodified parts of Vim, likewise unrestricted except that they must + include this license text. You are also allowed to include executables + that you made from the unmodified Vim sources, plus your own usage + examples and Vim scripts. + +II) It is allowed to distribute a modified (or extended) version of Vim, + including executables and/or source code, when the following four + conditions are met: + 1) This license text must be included unmodified. + 2) The modified Vim must be distributed in one of the following five ways: + a) If you make changes to Vim yourself, you must clearly describe in + the distribution how to contact you. When the maintainer asks you + (in any way) for a copy of the modified Vim you distributed, you + must make your changes, including source code, available to the + maintainer without fee. The maintainer reserves the right to + include your changes in the official version of Vim. What the + maintainer will do with your changes and under what license they + will be distributed is negotiable. If there has been no negotiation + then this license, or a later version, also applies to your changes. + The current maintainer is Bram Moolenaar . If this + changes it will be announced in appropriate places (most likely + vim.sf.net, www.vim.org and/or comp.editors). When it is completely + impossible to contact the maintainer, the obligation to send him + your changes ceases. Once the maintainer has confirmed that he has + received your changes they will not have to be sent again. + b) If you have received a modified Vim that was distributed as + mentioned under a) you are allowed to further distribute it + unmodified, as mentioned at I). If you make additional changes the + text under a) applies to those changes. + c) Provide all the changes, including source code, with every copy of + the modified Vim you distribute. This may be done in the form of a + context diff. You can choose what license to use for new code you + add. The changes and their license must not restrict others from + making their own changes to the official version of Vim. + d) When you have a modified Vim which includes changes as mentioned + under c), you can distribute it without the source code for the + changes if the following three conditions are met: + - The license that applies to the changes permits you to distribute + the changes to the Vim maintainer without fee or restriction, and + permits the Vim maintainer to include the changes in the official + version of Vim without fee or restriction. + - You keep the changes for at least three years after last + distributing the corresponding modified Vim. When the maintainer + or someone who you distributed the modified Vim to asks you (in + any way) for the changes within this period, you must make them + available to him. + - You clearly describe in the distribution how to contact you. This + contact information must remain valid for at least three years + after last distributing the corresponding modified Vim, or as long + as possible. + e) When the GNU General Public License (GPL) applies to the changes, + you can distribute the modified Vim under the GNU GPL version 2 or + any later version. + 3) A message must be added, at least in the output of the ":version" + command and in the intro screen, such that the user of the modified Vim + is able to see that it was modified. When distributing as mentioned + under 2)e) adding the message is only required for as far as this does + not conflict with the license used for the changes. + 4) The contact information as required under 2)a) and 2)d) must not be + removed or changed, except that the person himself can make + corrections. + +III) If you distribute a modified version of Vim, you are encouraged to use + the Vim license for your changes and make them available to the + maintainer, including the source code. The preferred way to do this is + by e-mail or by uploading the files to a server and e-mailing the URL. + If the number of changes is small (e.g., a modified Makefile) e-mailing a + context diff will do. The e-mail address to be used is + + +IV) It is not allowed to remove this license from the distribution of the Vim + sources, parts of it or from a modified version. You may use this + license for previous Vim releases instead of the license that they came + with, at your option. + +=== end of license === + +Note: + +- If you are happy with Vim, please express that by reading the rest of this + file and consider helping needy children in Uganda. + +- If you want to support further Vim development consider becoming a + |sponsor|. The money goes to Uganda anyway. + +- According to Richard Stallman the Vim license is GNU GPL compatible. + A few minor changes have been made since he checked it, but that should not + make a difference. + +- If you link Vim with a library that goes under the GNU GPL, this limits + further distribution to the GNU GPL. Also when you didn't actually change + anything in Vim. + +- Once a change is included that goes under the GNU GPL, this forces all + further changes to also be made under the GNU GPL or a compatible license. + +- If you distribute a modified version of Vim, you can include your name and + contact information with the "--with-modified-by" configure argument or the + MODIFIED_BY define. + +============================================================================== +Kibaale Children's Centre *kcc* *Kibaale* *charity* + +Kibaale Children's Centre (KCC) is located in Kibaale, a small town in the +south of Uganda, near Tanzania, in East Africa. The area is known as Rakai +District. The population is mostly farmers. Although people are poor, there +is enough food. But this district is suffering from AIDS more than any other +part of the world. Some say that it started there. Estimations are that 10 +to 30% of the Ugandans are infected with HIV. Because parents die, there are +many orphans. In this district about 60,000 children have lost one or both +parents, out of a population of 350,000. And this is still continuing. + +The children need a lot of help. The KCC is working hard to provide the needy +with food, medical care and education. Food and medical care to keep them +healthy now, and education so that they can take care of themselves in the +future. KCC works on a Christian base, but help is given to children of any +religion. + +The key to solving the problems in this area is education. This has been +neglected in the past years with president Idi Amin and the following civil +wars. Now that the government is stable again, the children and parents have +to learn how to take care of themselves and how to avoid infections. There is +also help for people who are ill and hungry, but the primary goal is to +prevent people from getting ill and to teach them how to grow healthy food. + +Most of the orphans are living in an extended family. An uncle or older +sister is taking care of them. Because these families are big and the income +(if any) is low, a child is lucky if it gets healthy food. Clothes, medical +care and schooling is beyond its reach. To help these needy children, a +sponsorship program was put into place. A child can be financially adopted. +For a few dollars a month KCC sees to it that the child gets indispensable +items, is healthy, goes to school and KCC takes care of anything else that +needs to be done for the child and the family that supports it. + +Besides helping the child directly, the environment where the child grows up +needs to be improved. KCC helps schools to improve their teaching methods. +There is a demonstration school at the centre and teacher trainings are given. +Health workers are being trained, hygiene education is carried out and +households are stimulated to build a proper latrine. I helped setting up a +production site for cement slabs. These are used to build a good latrine. +They are sold below cost price. + +There is a small clinic at the project, which provides children and their +family with medical help. When needed, transport to a hospital is offered. +Immunization programs are carried out and help is provided when an epidemic is +breaking out (measles and cholera have been a problem). + *donate* +Summer 1994 to summer 1995 I spent a whole year at the centre, working as a +volunteer. I have helped to expand the centre and worked in the area of water +and sanitation. I learned that the help that the KCC provides really helps. +When I came back to Holland, I wanted to continue supporting KCC. To do this +I'm raising funds and organizing the sponsorship program. Please consider one +of these possibilities: + +1. Sponsor a child in primary school: 17 euro a month (or more). +2. Sponsor a child in secondary school: 25 euro a month (or more). +3. Sponsor the clinic: Any amount a month or quarter +4. A one-time donation + +Compared with other organizations that do child sponsorship the amounts are +very low. This is because the money goes directly to the centre. Less than +5% is used for administration. This is possible because this is a small +organization that works with volunteers. If you would like to sponsor a +child, you should have the intention to do this for at least one year. + +How do you know that the money will be spent right? First of all you have my +personal guarantee as the author of Vim. I trust the people that are working +at the centre, I know them personally. Further more, the centre has been +co-sponsored and inspected by World Vision, Save the Children Fund and is now +under the supervision of Pacific Academy Outreach Society. The centre is +visited about once a year to check the progress (at our own cost). I have +visited the centre myself many times, starting in 1993. The visit reports are +on the ICCF web site. + +If you have any further questions, send me e-mail: . + +The address of the centre is: + Kibaale Children's Centre + p.o. box 1658 + Masaka, Uganda, East Africa + +Sending money: *iccf-donations* + +Check the ICCF web site for the latest information! See |iccf| for the URL. + + +USA: The methods mentioned below can be used. + Sending a check to the Nehemiah Group Outreach Society (NGOS) + is no longer possible, unfortunately. We are looking for + another way to get you an IRS tax receipt. + For sponsoring a child contact KCF in Canada (see below). US + checks can be sent to them to lower banking costs. + +Canada: Contact Kibaale Children's Fund (KCF) in Surrey, Canada. They + take care of the Canadian sponsors for the children in + Kibaale. KCF forwards 100% of the money to the project in + Uganda. You can send them a one time donation directly. + Please send me a note so that I know what has been donated + because of Vim. Ask KCF for information about sponsorship. + Kibaale Children's Fund c/o Pacific Academy + 10238-168 Street + Surrey, B.C. V4N 1Z4 + Canada + Phone: 604-581-5353 + If you make a donation to Kibaale Children's Fund (KCF) you + will receive a tax receipt which can be submitted with your + tax return. + +Holland: Transfer to the account of "Stichting ICCF Holland" in Lisse. + This will allow for tax deduction if you live in Holland. + Postbank, nr. 4548774 + IBAN: NL95 INGB 0004 5487 74 + +Germany: It is possible to make donations that allow for a tax return. + Check the ICCF web site for the latest information: + http://iccf-holland.org/germany.html + +World: Use a postal money order. That should be possible from any + country, mostly from the post office. Use this name (which is + in my passport): "Abraham Moolenaar". Use Euro for the + currency if possible. + +Europe: Use a bank transfer if possible. Your bank should have a form + that you can use for this. See "Others" below for the swift + code and IBAN number. + Any other method should work. Ask for information about + sponsorship. + +Credit Card: You can use PayPal to send money with a Credit card. This is + the most widely used Internet based payment system. It's + really simple to use. Use this link to find more info: + https://www.paypal.com/en_US/mrb/pal=XAC62PML3GF8Q + The e-mail address for sending the money to is: + Bram@iccf-holland.org + For amounts above 400 Euro ($500) sending a check is + preferred. + +Others: Transfer to one of these accounts if possible: + Postbank, account 4548774 + Swift code: INGB NL 2A + IBAN: NL95 INGB 0004 5487 74 + under the name "stichting ICCF Holland", Lisse + If that doesn't work: + Rabobank Lisse, account 3765.05.117 + Swift code: RABO NL 2U + under the name "Bram Moolenaar", Lisse + Otherwise, send a check in euro or US dollars to the address + below. Minimal amount: $70 (my bank does not accept smaller + amounts for foreign check, sorry) + +Address to send checks to: + Bram Moolenaar + Finsterruetihof 1 + 8134 Adliswil + Switzerland + +This address is expected to be valid for a long time. + + vim:tw=78:ts=8:ft=help:norl: diff --git a/pcr/vim-autotag/PKGBUILD b/pcr/vim-autotag/PKGBUILD new file mode 100644 index 000000000..44ff0c603 --- /dev/null +++ b/pcr/vim-autotag/PKGBUILD @@ -0,0 +1,35 @@ +# Contributor: Daniel Milewski + +pkgname=vim-autotag +pkgver=r5.433b6b5 +_gitcommit=433b6b5be330615c4cb97ec748a773115dcced60 +pkgrel=1 +pkgdesc='Automatically discover and "properly" update ctags files on save' +arch=(any) +url=https://github.com/craigemery/vim-autotag +license=(custom:vim) +groups=(vim-plugins) +mkdepends=(git) +depends=(ctags vim) +mksource=($pkgname-$pkgver::git+https://github.com/craigemery/$pkgname.git#commit=$_gitcommit) +source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz LICENSE) +mksha256sums=(SKIP) +sha256sums=(3fe4270ec84a4299866c6c205a9869055a72194c6482fed7a7c4bb99acc5b5b0 + 62743e7d4354d94ef0957dd8aa43983b9244eb3cd820075b18f10b9d37d31c2d) + +mksource() +{ + cd "$srcdir/$pkgname-$pkgver" + + rm .gitignore +} + +package() +{ + cd "$srcdir/$pkgname-$pkgver" + + install -Dm 644 plugin/autotag.py "$pkgdir/usr/share/vim/vimfiles/plugin/autotag.py" + install -Dm 644 plugin/autotag.vim "$pkgdir/usr/share/vim/vimfiles/plugin/autotag.vim" + + install -Dm 644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} -- cgit v1.2.3-54-g00ecf From 6587490363bbb343b8bb771ca5f40d1d4a51d132 Mon Sep 17 00:00:00 2001 From: Daniel Milewski Date: Thu, 29 Jan 2015 21:22:08 +0100 Subject: smartypants: fix the license declaration --- pcr/smartypants/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcr/smartypants/PKGBUILD b/pcr/smartypants/PKGBUILD index 5f7f42d6d..c803986e8 100644 --- a/pcr/smartypants/PKGBUILD +++ b/pcr/smartypants/PKGBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc='Smart punctuation for web sites' arch=(any) url=http://daringfireball.net/projects/smartypants/ -license=(BSD) +license=(BSD3) depends=(perl) makedepends=(unzip) source=(http://daringfireball.net/projects/downloads/SmartyPants_$pkgver.zip) -- cgit v1.2.3-54-g00ecf From 99c52ec7c4ee59edf2dff4ee3091e1ab673b7690 Mon Sep 17 00:00:00 2001 From: Daniel Milewski Date: Thu, 29 Jan 2015 21:54:08 +0100 Subject: vim-autotag: put symlink in place of license file --- pcr/vim-autotag/LICENSE | 288 ----------------------------------------------- pcr/vim-autotag/PKGBUILD | 8 +- 2 files changed, 4 insertions(+), 292 deletions(-) delete mode 100644 pcr/vim-autotag/LICENSE diff --git a/pcr/vim-autotag/LICENSE b/pcr/vim-autotag/LICENSE deleted file mode 100644 index 113df4f64..000000000 --- a/pcr/vim-autotag/LICENSE +++ /dev/null @@ -1,288 +0,0 @@ -*uganda.txt* For Vim version 7.4. Last change: 2013 Jul 06 - - - VIM REFERENCE MANUAL by Bram Moolenaar - - - *uganda* *Uganda* *copying* *copyright* *license* -SUMMARY - *iccf* *ICCF* -Vim is Charityware. You can use and copy it as much as you like, but you are -encouraged to make a donation for needy children in Uganda. Please see |kcc| -below or visit the ICCF web site, available at these URLs: - - http://iccf-holland.org/ - http://www.vim.org/iccf/ - http://www.iccf.nl/ - -You can also sponsor the development of Vim. Vim sponsors can vote for -features. See |sponsor|. The money goes to Uganda anyway. - -The Open Publication License applies to the Vim documentation, see -|manual-copyright|. - -=== begin of license === - -VIM LICENSE - -I) There are no restrictions on distributing unmodified copies of Vim except - that they must include this license text. You can also distribute - unmodified parts of Vim, likewise unrestricted except that they must - include this license text. You are also allowed to include executables - that you made from the unmodified Vim sources, plus your own usage - examples and Vim scripts. - -II) It is allowed to distribute a modified (or extended) version of Vim, - including executables and/or source code, when the following four - conditions are met: - 1) This license text must be included unmodified. - 2) The modified Vim must be distributed in one of the following five ways: - a) If you make changes to Vim yourself, you must clearly describe in - the distribution how to contact you. When the maintainer asks you - (in any way) for a copy of the modified Vim you distributed, you - must make your changes, including source code, available to the - maintainer without fee. The maintainer reserves the right to - include your changes in the official version of Vim. What the - maintainer will do with your changes and under what license they - will be distributed is negotiable. If there has been no negotiation - then this license, or a later version, also applies to your changes. - The current maintainer is Bram Moolenaar . If this - changes it will be announced in appropriate places (most likely - vim.sf.net, www.vim.org and/or comp.editors). When it is completely - impossible to contact the maintainer, the obligation to send him - your changes ceases. Once the maintainer has confirmed that he has - received your changes they will not have to be sent again. - b) If you have received a modified Vim that was distributed as - mentioned under a) you are allowed to further distribute it - unmodified, as mentioned at I). If you make additional changes the - text under a) applies to those changes. - c) Provide all the changes, including source code, with every copy of - the modified Vim you distribute. This may be done in the form of a - context diff. You can choose what license to use for new code you - add. The changes and their license must not restrict others from - making their own changes to the official version of Vim. - d) When you have a modified Vim which includes changes as mentioned - under c), you can distribute it without the source code for the - changes if the following three conditions are met: - - The license that applies to the changes permits you to distribute - the changes to the Vim maintainer without fee or restriction, and - permits the Vim maintainer to include the changes in the official - version of Vim without fee or restriction. - - You keep the changes for at least three years after last - distributing the corresponding modified Vim. When the maintainer - or someone who you distributed the modified Vim to asks you (in - any way) for the changes within this period, you must make them - available to him. - - You clearly describe in the distribution how to contact you. This - contact information must remain valid for at least three years - after last distributing the corresponding modified Vim, or as long - as possible. - e) When the GNU General Public License (GPL) applies to the changes, - you can distribute the modified Vim under the GNU GPL version 2 or - any later version. - 3) A message must be added, at least in the output of the ":version" - command and in the intro screen, such that the user of the modified Vim - is able to see that it was modified. When distributing as mentioned - under 2)e) adding the message is only required for as far as this does - not conflict with the license used for the changes. - 4) The contact information as required under 2)a) and 2)d) must not be - removed or changed, except that the person himself can make - corrections. - -III) If you distribute a modified version of Vim, you are encouraged to use - the Vim license for your changes and make them available to the - maintainer, including the source code. The preferred way to do this is - by e-mail or by uploading the files to a server and e-mailing the URL. - If the number of changes is small (e.g., a modified Makefile) e-mailing a - context diff will do. The e-mail address to be used is - - -IV) It is not allowed to remove this license from the distribution of the Vim - sources, parts of it or from a modified version. You may use this - license for previous Vim releases instead of the license that they came - with, at your option. - -=== end of license === - -Note: - -- If you are happy with Vim, please express that by reading the rest of this - file and consider helping needy children in Uganda. - -- If you want to support further Vim development consider becoming a - |sponsor|. The money goes to Uganda anyway. - -- According to Richard Stallman the Vim license is GNU GPL compatible. - A few minor changes have been made since he checked it, but that should not - make a difference. - -- If you link Vim with a library that goes under the GNU GPL, this limits - further distribution to the GNU GPL. Also when you didn't actually change - anything in Vim. - -- Once a change is included that goes under the GNU GPL, this forces all - further changes to also be made under the GNU GPL or a compatible license. - -- If you distribute a modified version of Vim, you can include your name and - contact information with the "--with-modified-by" configure argument or the - MODIFIED_BY define. - -============================================================================== -Kibaale Children's Centre *kcc* *Kibaale* *charity* - -Kibaale Children's Centre (KCC) is located in Kibaale, a small town in the -south of Uganda, near Tanzania, in East Africa. The area is known as Rakai -District. The population is mostly farmers. Although people are poor, there -is enough food. But this district is suffering from AIDS more than any other -part of the world. Some say that it started there. Estimations are that 10 -to 30% of the Ugandans are infected with HIV. Because parents die, there are -many orphans. In this district about 60,000 children have lost one or both -parents, out of a population of 350,000. And this is still continuing. - -The children need a lot of help. The KCC is working hard to provide the needy -with food, medical care and education. Food and medical care to keep them -healthy now, and education so that they can take care of themselves in the -future. KCC works on a Christian base, but help is given to children of any -religion. - -The key to solving the problems in this area is education. This has been -neglected in the past years with president Idi Amin and the following civil -wars. Now that the government is stable again, the children and parents have -to learn how to take care of themselves and how to avoid infections. There is -also help for people who are ill and hungry, but the primary goal is to -prevent people from getting ill and to teach them how to grow healthy food. - -Most of the orphans are living in an extended family. An uncle or older -sister is taking care of them. Because these families are big and the income -(if any) is low, a child is lucky if it gets healthy food. Clothes, medical -care and schooling is beyond its reach. To help these needy children, a -sponsorship program was put into place. A child can be financially adopted. -For a few dollars a month KCC sees to it that the child gets indispensable -items, is healthy, goes to school and KCC takes care of anything else that -needs to be done for the child and the family that supports it. - -Besides helping the child directly, the environment where the child grows up -needs to be improved. KCC helps schools to improve their teaching methods. -There is a demonstration school at the centre and teacher trainings are given. -Health workers are being trained, hygiene education is carried out and -households are stimulated to build a proper latrine. I helped setting up a -production site for cement slabs. These are used to build a good latrine. -They are sold below cost price. - -There is a small clinic at the project, which provides children and their -family with medical help. When needed, transport to a hospital is offered. -Immunization programs are carried out and help is provided when an epidemic is -breaking out (measles and cholera have been a problem). - *donate* -Summer 1994 to summer 1995 I spent a whole year at the centre, working as a -volunteer. I have helped to expand the centre and worked in the area of water -and sanitation. I learned that the help that the KCC provides really helps. -When I came back to Holland, I wanted to continue supporting KCC. To do this -I'm raising funds and organizing the sponsorship program. Please consider one -of these possibilities: - -1. Sponsor a child in primary school: 17 euro a month (or more). -2. Sponsor a child in secondary school: 25 euro a month (or more). -3. Sponsor the clinic: Any amount a month or quarter -4. A one-time donation - -Compared with other organizations that do child sponsorship the amounts are -very low. This is because the money goes directly to the centre. Less than -5% is used for administration. This is possible because this is a small -organization that works with volunteers. If you would like to sponsor a -child, you should have the intention to do this for at least one year. - -How do you know that the money will be spent right? First of all you have my -personal guarantee as the author of Vim. I trust the people that are working -at the centre, I know them personally. Further more, the centre has been -co-sponsored and inspected by World Vision, Save the Children Fund and is now -under the supervision of Pacific Academy Outreach Society. The centre is -visited about once a year to check the progress (at our own cost). I have -visited the centre myself many times, starting in 1993. The visit reports are -on the ICCF web site. - -If you have any further questions, send me e-mail: . - -The address of the centre is: - Kibaale Children's Centre - p.o. box 1658 - Masaka, Uganda, East Africa - -Sending money: *iccf-donations* - -Check the ICCF web site for the latest information! See |iccf| for the URL. - - -USA: The methods mentioned below can be used. - Sending a check to the Nehemiah Group Outreach Society (NGOS) - is no longer possible, unfortunately. We are looking for - another way to get you an IRS tax receipt. - For sponsoring a child contact KCF in Canada (see below). US - checks can be sent to them to lower banking costs. - -Canada: Contact Kibaale Children's Fund (KCF) in Surrey, Canada. They - take care of the Canadian sponsors for the children in - Kibaale. KCF forwards 100% of the money to the project in - Uganda. You can send them a one time donation directly. - Please send me a note so that I know what has been donated - because of Vim. Ask KCF for information about sponsorship. - Kibaale Children's Fund c/o Pacific Academy - 10238-168 Street - Surrey, B.C. V4N 1Z4 - Canada - Phone: 604-581-5353 - If you make a donation to Kibaale Children's Fund (KCF) you - will receive a tax receipt which can be submitted with your - tax return. - -Holland: Transfer to the account of "Stichting ICCF Holland" in Lisse. - This will allow for tax deduction if you live in Holland. - Postbank, nr. 4548774 - IBAN: NL95 INGB 0004 5487 74 - -Germany: It is possible to make donations that allow for a tax return. - Check the ICCF web site for the latest information: - http://iccf-holland.org/germany.html - -World: Use a postal money order. That should be possible from any - country, mostly from the post office. Use this name (which is - in my passport): "Abraham Moolenaar". Use Euro for the - currency if possible. - -Europe: Use a bank transfer if possible. Your bank should have a form - that you can use for this. See "Others" below for the swift - code and IBAN number. - Any other method should work. Ask for information about - sponsorship. - -Credit Card: You can use PayPal to send money with a Credit card. This is - the most widely used Internet based payment system. It's - really simple to use. Use this link to find more info: - https://www.paypal.com/en_US/mrb/pal=XAC62PML3GF8Q - The e-mail address for sending the money to is: - Bram@iccf-holland.org - For amounts above 400 Euro ($500) sending a check is - preferred. - -Others: Transfer to one of these accounts if possible: - Postbank, account 4548774 - Swift code: INGB NL 2A - IBAN: NL95 INGB 0004 5487 74 - under the name "stichting ICCF Holland", Lisse - If that doesn't work: - Rabobank Lisse, account 3765.05.117 - Swift code: RABO NL 2U - under the name "Bram Moolenaar", Lisse - Otherwise, send a check in euro or US dollars to the address - below. Minimal amount: $70 (my bank does not accept smaller - amounts for foreign check, sorry) - -Address to send checks to: - Bram Moolenaar - Finsterruetihof 1 - 8134 Adliswil - Switzerland - -This address is expected to be valid for a long time. - - vim:tw=78:ts=8:ft=help:norl: diff --git a/pcr/vim-autotag/PKGBUILD b/pcr/vim-autotag/PKGBUILD index 44ff0c603..6c53c0e7d 100644 --- a/pcr/vim-autotag/PKGBUILD +++ b/pcr/vim-autotag/PKGBUILD @@ -12,10 +12,9 @@ groups=(vim-plugins) mkdepends=(git) depends=(ctags vim) mksource=($pkgname-$pkgver::git+https://github.com/craigemery/$pkgname.git#commit=$_gitcommit) -source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz LICENSE) +source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz) mksha256sums=(SKIP) -sha256sums=(3fe4270ec84a4299866c6c205a9869055a72194c6482fed7a7c4bb99acc5b5b0 - 62743e7d4354d94ef0957dd8aa43983b9244eb3cd820075b18f10b9d37d31c2d) +sha256sums=(3fe4270ec84a4299866c6c205a9869055a72194c6482fed7a7c4bb99acc5b5b0) mksource() { @@ -31,5 +30,6 @@ package() install -Dm 644 plugin/autotag.py "$pkgdir/usr/share/vim/vimfiles/plugin/autotag.py" install -Dm 644 plugin/autotag.vim "$pkgdir/usr/share/vim/vimfiles/plugin/autotag.vim" - install -Dm 644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -d "$pkgdir/usr/share/licenses/$pkgname" + ln -s /usr/share/licenses/vim-runtime/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -- cgit v1.2.3-54-g00ecf From e4bc599941f542850125b6f49e7374471283c351 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 31 Jan 2015 14:35:03 -0200 Subject: iceweasel-1:35.0.1.deb1-1: updating version --- libre/iceweasel/PKGBUILD | 10 ++-- libre/iceweasel/libre.patch | 127 ++++++++++++++++++++++++++++++++------------ 2 files changed, 98 insertions(+), 39 deletions(-) diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 3b46f4742..3402dbec8 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -16,7 +16,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=35.0 +_debver=35.0.1 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -53,10 +53,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js rhbz-966424.patch $pkgname-fixed-loading-icon.png) -sha256sums=('7702b1873757c8ec2f911680ff63ded124ab7b3610ef5c1456581146451a641e' - '0b59e3f72ac50475832fbd64055411bb81264526f06492f2a5801e4d859da7de' +sha256sums=('44646270b68b7ec5ee73516ea5bada0f32d1c2c01d4afdb7102ba7f98c93a7a8' + '8ca7c37f040f0f3ebe7aeb3d57e13c4aa1d4e53ce8f3622d600b6e9f61f832a1' '831720c1efd6e67d54e70cf4e2b02f9554aa6c914315be6dd2ca837adbbdcabd' - 'e3aa10890a54c312d7a8aa36e4371f78799a8bd7a1b887612fcd7223d2fe30bf' + '1fd1383f87473671370e89f33c4d8ffdc89dbe6ae4b7d8ad23e15d83bb17740f' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '84895ff873a89770c62c4568fd111ac92d540b4499b2b77258c6c88a929ef049' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 089be5913..7025151ad 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -668,40 +668,6 @@ diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/ content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml) -diff -Nur mozilla-release.orig/browser/devtools/webide/webide-prefs.js mozilla-release/browser/devtools/webide/webide-prefs.js ---- mozilla-release.orig/browser/devtools/webide/webide-prefs.js 2015-01-09 02:38:16.000000000 -0200 -+++ mozilla-release/browser/devtools/webide/webide-prefs.js 2015-01-22 15:54:09.172617578 -0200 -@@ -4,21 +4,21 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - pref("devtools.webide.showProjectEditor", true); --pref("devtools.webide.templatesURL", "https://code.cdn.mozilla.net/templates/list.json"); --pref("devtools.webide.autoinstallADBHelper", true); -+pref("devtools.webide.templatesURL", ""); -+pref("devtools.webide.autoinstallADBHelper", false); - #ifdef MOZ_DEV_EDITION - pref("devtools.webide.autoinstallFxdtAdapters", true); - #else - pref("devtools.webide.autoinstallFxdtAdapters", false); - #endif - pref("devtools.webide.restoreLastProject", true); --pref("devtools.webide.addonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/index.json"); --pref("devtools.webide.simulatorAddonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/#VERSION#/#OS#/fxos_#SLASHED_VERSION#_simulator-#OS#-latest.xpi"); --pref("devtools.webide.simulatorAddonID", "fxos_#SLASHED_VERSION#_simulator@mozilla.org"); --pref("devtools.webide.adbAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/adb-helper/#OS#/adbhelper-#OS#-latest.xpi"); --pref("devtools.webide.adbAddonID", "adbhelper@mozilla.org"); --pref("devtools.webide.adaptersAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxdt-adapters/#OS#/fxdt-adapters-#OS#-latest.xpi"); --pref("devtools.webide.adaptersAddonID", "fxdevtools-adapters@mozilla.org"); -+pref("devtools.webide.addonsURL", ""); -+pref("devtools.webide.simulatorAddonsURL", ""); -+pref("devtools.webide.simulatorAddonID", ""); -+pref("devtools.webide.adbAddonURL", ""); -+pref("devtools.webide.adbAddonID", ""); -+pref("devtools.webide.adaptersAddonURL", ""); -+pref("devtools.webide.adaptersAddonID", ""); - pref("devtools.webide.monitorWebSocketURL", "ws://localhost:9000"); - pref("devtools.webide.lastConnectedRuntime", ""); - pref("devtools.webide.lastSelectedProject", ""); diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd --- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-09 02:38:16.000000000 -0200 +++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-16 15:03:01.408257268 -0200 @@ -723,6 +689,99 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dt +- ++ + + + +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties 2015-01-31 12:33:10.797565416 -0200 +@@ -4,7 +4,7 @@ + + # LOCALIZATION NOTE These strings are used inside the Source Editor component. + # This component is used whenever source code is displayed for the purpose of +-# being edited, inside the Firefox developer tools - current examples are the ++# being edited, inside the Iceweasel developer tools - current examples are the + # Scratchpad and the Style Editor tools. + + # LOCALIZATION NOTE The correct localization of this file might be to keep it +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-01-31 12:34:06.301357174 -0200 +@@ -79,7 +79,7 @@ + - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled + - boolean preference in about:config, in the options panel. --> + +- ++ + + +- ++ + + + +- ++ + + + +@@ -48,7 +48,7 @@ + + + +- ++ + + + +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-01-31 12:35:03.848498325 -0200 +@@ -2,8 +2,8 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-title_noApp=Firefox WebIDE +-title_app=Firefox WebIDE: %S ++title_noApp=Iceweasel WebIDE ++title_app=Iceweasel WebIDE: %S + + runtimeButton_label=Select Runtime + projectButton_label=Open App +@@ -45,10 +45,10 @@ + addons_stable=stable + addons_unstable=unstable + # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of +-# a given simulator version in the "Manage Simulators" pane. %1$S: Firefox OS ++# a given simulator version in the "Manage Simulators" pane. %1$S: Iceweasel OS + # version in the simulator, ex. 1.3. %2$S: Simulator stability label, ex. + # "stable" or "unstable". +-addons_simulator_label=Firefox OS %1$S Simulator (%2$S) ++addons_simulator_label=Iceweasel OS %1$S Simulator (%2$S) + addons_install_button=install + addons_uninstall_button=uninstall + addons_adb_label=ADB Helper Add-on diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties --- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-09 02:38:16.000000000 -0200 +++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-16 15:03:01.408257268 -0200 -- cgit v1.2.3-54-g00ecf From 0ce846058be10695eb14ee39a2bf122fea9905ef Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 31 Jan 2015 14:35:30 -0200 Subject: iceweasel-l10n-1:35.0.1.deb1-1: updating version --- libre/iceweasel-l10n/PKGBUILD | 181 ++++++++++++++++++++++-------------------- 1 file changed, 93 insertions(+), 88 deletions(-) diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 87f0e4d29..8e64decdd 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: fauno # Contributor: Figue -_debver=35.0 +_debver=35.0.1 _debrel=deb1 epoch=1 _pkgbase=iceweasel @@ -142,6 +142,11 @@ _package() { unzip langpack-$1@iceweasel.mozilla.org.xpi -d $1 rm -v langpack-$1@iceweasel.mozilla.org.xpi install -vDm644 $srcdir/region.properties $1/browser/chrome/$1/locale/browser-region + sed -i 's|Firefox|Iceweasel| + ' $1/browser/chrome/$1/locale/browser/devtools/sourceeditor.properties \ + $1/browser/chrome/$1/locale/browser/devtools/toolbox.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.properties rm -rv $1/{browser/{chrome/.mkdir.done,searchplugins},chrome/{.mkdir.done,$1/locale/$1/global-platform/{mac,win}}} cd $1 zip -r langpack-$1@iceweasel.mozilla.org.xpi . @@ -165,90 +170,90 @@ _package() { } sha256sums=('652dddf407ab9b0e00ab8cba7c1ea9b3aff2a8f7519966010fd682ae182281c2' - '3ce40daabd4ce7f7faadaaf6ee6e4eb0217ab4dd9dc10f573ce46387fe0cb60a' - '8d0dff7d1edb9358e647bd530ebe418455972a24b870d5164369b6b3382f6e66' - 'e8794feb3cb76893e3a4c5489330282452f990e079be3802e66acccd5a90c6ed' - '5e2d68e9ed07acf1bc33dac6a03258e3652273b660834617aa67c55665841a2b' - '3b1145fc95731f1d3a7b4557f332d42a30e8d3b42c5874da46d86bc18aa64ed1' - '61a415227122b8accc856380ec4f1deda0d524c8bc4dbd939228fd8de1801752' - '67cdb8253146c627c67abfa4db61104634824d5f1811cd23281469764651e414' - '95f7a0d862b91c46f3f2d4e807461ff2fd8b379e82c75d430c3c9899313970d0' - '57a30ffbd9fe1fda01436415e69c88aab0ffc1e1f7f4ed3816e3052a4d7b655a' - '3be3bf9dd85aaa4b4d5a3a350511285537a5063f1cd0254fbaef81a5a3fcdc3f' - '4febee23d04e8ba3af5f6b433abc07e77d427caae5edc85fffe5682fb93e95e5' - '5ee7fdb3fa351a306bb2255a93c843a411a64c53b0d53cb16c3b387f08d62dc8' - '36f7df9c5468c7e0029d06aaffac80f4424bf8be10d9bc390b034224622ac397' - '563b031fd1db57bdd3ed9efa5d17291595f3542ff444185d87ea14b55ab7ac1c' - '39dbf82d999bb512c4d0d557617900659599d54ead020c7cc6229f30ae2d10bd' - '65702c2f85907b4edd8b203d097883e11ff69d8038b403e5185e1ec498808d51' - '0f4da81df3b34fbbbbae74f0e6a289b11ee2322685c6e063b33e524bcb6c640e' - 'd0e64384eda7c11b28e128a323653209548ad9ce5e326ae7c821fc039f13a519' - 'cd70fb88002419eef3da112769dc9fff4df4bc2834d4f5d31eabcbfc7b5ab720' - 'd02370eebe2e01c95feed722b8dbd8f4dbe46969007d9d0e0daba235e8c4ccb2' - '1de09a77a26c0fcab9e5e98b1ff664b5810b190b0a1ad600f1643e4066e73bf2' - '903e73f5599d7b8eaf31e259b146aa00dee9f71e97827a7cdb7bef219440c979' - '19a35ede9b4ae539f6f27a2205c59286d63fec3c81829b17c4681d5106362650' - '91156011bf081f153120292026a1eb818726de7be6706c82456d5e6b9c529367' - '9f09a9dc597b4cb7c343d6d40cd4f045c50eea646ef4e3ae57efec791a114855' - '7b4de0d4dfe7e3540ebffc424607d83df8eca2a6e44a60096841360a1aa6d894' - 'ac377d2f43743c9dcb8be310ffa431b0baf39396ce8d020e8c822c0832d5a887' - '1e202db134d87ded77d49bdd7a6c5d57f7bfcb5b07738e94d515b5ec1cd62d23' - 'c9d0b6e9f50170b6d1f7107abbcfcfd9bb3063a5ade43abb5b6a5a27c6c2100b' - '3e506a1845b16c79e208b8a785e1bf6d637a9956683c926bdf4656fa0a2ace41' - '1485f5c7acf2192a404944c706b2a69bc85bf72ff3eb7ce96fbae8892a24b67e' - 'f0122983121e1a76ff6c7264e894807f2e8ed771ab6e10fecc188ff1df00c860' - '1f8a43043b55cf1916c3b09138f0598351aa1b964aa5f500b8d41e8af99fb69f' - '95b89ca90f5a5fbd4a19e0fb844d3bc777fa12449ad2cf602787dd44fb86462c' - 'e1bab83d683dff719bc9fad92c046c6a9b4be2f5c92fccd09ed1dc27daf8af6f' - 'afb787c19c20ecf6a61b89058cfb8c207407316efe71116f485d78a8b0e214c6' - '8d33c8990a9f875a3177dbc0ed43b43fbae136abd546ce60946c96d803735dfd' - '437faf4b42e488fe89e713a91c796afb33ab1588fe756a1643e9f923498214f8' - 'a1dda51b4fdca9e34e86b1fac0f48069c1e20af978e5cf1cd8d2808e222b0e7f' - '54fd4e7eaba89d8be91b031ce1ae329b07b48d8247f23a5f7b818c02dfee87c8' - '929413fd291f1d98ddc41be084947fe1843e3d789175c88bf15567a3a384627f' - 'f60abccf4e6b884af83ae1bb5be885de579deea1ec92eebc71b37d6c301499c5' - 'ae65e8c70cf369b89311509bb192d35241b8b5fc23cd11a9ff1e4bdde3a6b2ff' - 'de067635977b9bfb6a71050931f1e0f239d8a1a5f0f46bb36d27710a03573da2' - 'dd20204098d39b0d7c8a3c6153794c75883128f77af865a5f6d67f7880c62585' - 'd7d5b5e493fa3c4dd413507aa395ee79a7fa9ae993955d341541ef3b5af2c24a' - '851e0a421fa68d6369647fe0519ce54e477702f38d03e94663ec2ccf005a4157' - '30c53d625d4d962b80dd0504b50bb334769cbb9d24e0342be0f6ec03f60d904c' - '5551dc12139b7e6cf5aa7fda4df5a215812ea21df84ddf6d13ac3aa653bb4898' - '4160122fa50ae9b1366a7a43e49d7558c80370615850c6397251dace3307756b' - 'eafe467d330e57d41dd970a588e45d71bba9e5b0843b3532f772b5dc5f690f8a' - 'c3e87dfc9b546532227bfa3365b73181a7e1eb913843570fa7478fd1ac9f04c4' - '3e832236cf01c94cf456af3d114c357aed62dba968385c25a6005b47a787254b' - 'bf76cba9772cb5bcdfdceade9708f2fa522145daa78580a13500d4827579801b' - 'df9518186a7ce74e69f15f8a6fc28d46bdde6613929beb864f5f7ffb84d51890' - '10fef94856178f987ed176b571124438b093ab0493fb6cb50367f161af305a70' - '502690f088e20ab70ea4e5612574cb14045da24a2ff011f64520fd4ea77043dd' - 'cac5d1dcc3ca88f79475c068ce6e2294e8b78b4500ddad35986492fba08a0aab' - 'bc625a8d4fdd4f41dbd196956e0e8ce0dd4b197300b10621f0005fa4afba4871' - '715dba51789587996ac57f4f62e3cf864d4a9f836a387d6e5d21f9835aca86c0' - '974f5aec06bbd8c7bf9fdafa58ec6262dd46c4dbc343ec570e4108955871fd2b' - '16bb5efccabf09fe65001a20c5050662605056397ad8e2e48faeebf92a4a864c' - 'e56358e17c23b2db12fb539a564c077822d393addbc1ba086f9d07417c802980' - '35c70bc0b3abe01900120c28e898b712e86afc976ef3a49b2864ef8d1968745a' - '813ffb64c0bf130085ab08b456fbc343edf5393d0ea836c21e87324178de6467' - 'cf3df54ef8c5acb31572f18ed674338c91f3ac46cb046e944465e1931c6d7892' - '5a6ca80102e977029dd8d7de2e1113f0be7b049b239440d88c65c155ae033b69' - 'c59044ef9600adc3f8ad51e818fbd312f1687c79f7d89c133dcea17fa1ad1343' - 'ce7ccf52f57473f702f5a14f61dcaf4b78064c0b67b58d9126fbd701ee0ab907' - '6535c0f496fd95df5a2f3b2d1a09c85f02fadff9f38e9fd49f5ad948d1514870' - '829072d62ed0825861a593b4bab342656a810ca0634084f63b5e85c869039212' - '33f59be065aacb4df72a1cc71398a4036f5648b7c2bda1160d1f1988c3ac5062' - 'cfb09672f05b74c48155eb5bd09bbe6091530df13f749f8a971ea75f5e416d7d' - '734a33d5bf1f50e046c38c0a58a84f7625baab3f9a8e9a929085d966865a2d44' - '79eb12b75c1ceb2143a2d0c9289b7d52ce061998084fe5f07441328af975ff22' - '407d59fb8424bd96b25e632ea269bfaafa6bf5bf9ee00b790689fad39ddebae2' - '2ef57100d9c500b93c6a5a87df2248f0ea59f4249d051e8b3af8268c47b1e9ef' - '3b867f1a10c1e05d6315a7c0d196c454832a497d6dc276ee6a23fe1c065a05dc' - '4ac85124c4db954b31d114cb7ecefa817234d3fd458e9bac3f65b518ff23ebf8' - '6803ec95765541862dad5faf8387e92f9201860dda33240b1aa939eb2294a236' - '4af8aaf8a443e2dbc515486dfa9d6a844912dafa58a38f534dc5cafe2121aa48' - 'a556470c3583937249448d8d46e7cacef57cdc402e9f68f28fd6c0e1ee1aca9a' - 'f0aac24f4bf6397ce5ce7d41a9fe1e76f086da3c282bae00985f2a15ed8b0b11' - '6282a9b5d520cbea6d02a95d8e4d73e3e59675cba459c7567d94846f67d054e2' - '99408bd38e511227854d28b19af94771f41d1b78e86142e07b2b0d206052b77b' - '4a0c312b8b4013f6a3e7a6c6c6a7fa07186ff9e4347a023a2d21ae7f3c64b5c2' - '5690083d3480da9b5b1ec9f0478a989f32cf2d1742cad94c5c3c4c2ae62afd9b') + '264d52669f8930ba74997e6fb7d63de95fe93d058518806aff210647e4a502be' + '9b24d64e37164f1e65f64d55e9c96bc451121883a3ea487e7abb064b8d8e9972' + 'af4e35e2369a3eca973455d997e094bd5d548da9308cd29ea1ccfbb2d75044ce' + 'fd94acf77ef8ed1da3209535574769e246b50e617bb1f0f4aaa278efa964f9e2' + 'a0d79d5f360ba7b249e56a9ae265dc145ffce3e702d61a9329d4f23272754c1d' + 'bb97f8d3488559e2679b39d5f1d02d13f99a9fc3b095096097c560cc7b2fe670' + '7d8224ba66aa3fcee6138bbf58b214a95630ea9d6b1b5ae1d216b15414f1f411' + '3985900142ab4e1845ec58d838d413e7a387892e4bd073d5c79250921ae1f576' + 'a2a61676a52e65994fe5d22866f07557e5bad680f796a12b58d2f21c088a2477' + '4b121f1c2c0214e5615474ff8f449292c44294f3be4861abcd6addc590c3a077' + 'de8444ffc486084dd7e7f268a9a73d3c4c43c6255c7be267c8ac6d626b0175ad' + '55d08a4133610dc6f7bec0be62645275c896e9bd8ac4f165579c2c95cb174284' + 'b280bda9964ebcc788c2186bacb681e05d0adc13e8b2bce129939b33efeb6f76' + '1c633b9052da07a3a233d4d66a6f18ee382d495455d2456b9212f6c5ed7a703c' + 'a587cc5927944bc9b96bdad71173d97e1fb96211405586a6e364022a950e5264' + '7410ec9d698a27b0a8d20d461152c248eba019ebd47cf5c8969ad3c6ed062ad7' + '6a84afcd7a29ed872d866faf90ce39c0945a85585537cb35f5cf71d9a2cd96a3' + '79f163e0f5daeeb707c0a083570fce2b643536be4448736087718d2bed5425c9' + '8d47243a3386430dd78e55f917c3488923d51fa6ecdae26bc6f908005cdbe0e2' + 'ecccbfa90833691b02c7e434d64c4bd361a679f7d24d22fa1207e47b76bc7148' + '55ff4d61d94ca9fad2fc6e032503b577ff35ac99e02a3f14e31affd0f5e7d06e' + 'c60876091de37bf36ded53cfab410e09587f1167e9359e5c52d64665541718d3' + '09d040f2e337edefb27a5c6608c4a7e3de46a4cafedc68ec6c1e44195596c86f' + '1a461536f83f2cf011005a8822479a7ab5598d885d779d03b2c613d583f5b9cb' + '9e3973cd3acbcc6d3ecb4135f8b9e09ce633dea39bfbbc8d6ffc78132696e056' + '12fe11d4e2c066191860b6632bc2e2953c9ffc9fc846a7f624cf692116f274ad' + '494d6e8e1805c426266bcc206fcd013f3835aa13b3e429d98771987202f89a6e' + '60f65fc9984f7b1695d4cabe1b833cbed99cb04911793c2032c490c90dc3a447' + 'ab21b77c1e4f52052c928ef0b846067dd568eaa183e81b76897ffd8864dd5484' + '5ebace36caa3f049aedd8cb3bc283db89899e8967f886969ad3f0fcc2f98bc10' + 'b354a64505c92da0e4d82d44b45a0a2ec9ed8660077733187f2b089b3ee8763d' + 'a1bbe8919ddfe3ac8813146ac5c2551b95cb15ff9a3c4fdbbcbcd867cd77488c' + 'e933fd3e62e2176855a3e259f8b2e2f12f394aff9c7f2ddb4117cfdd05d2e588' + '3a4cfaa063bfbdee457bd6896be62b34f813c06ed7a66fad229194f2a9b151be' + 'cc041cc1426d5370b912caa6b0d3576043624cc165c98594916f3b3aad0199d1' + '7aca3f1e5e2f9a7083f60add6f012db7c5d0fcfb8bc309ea39d957dcf30b8573' + 'cbe180595dc3bad1ad189e79057fecfff5ae69c68611d343b16ad330e8b05f7c' + '30801cd4f00b9e3ca558d0e4a90f75386f60030cda35b7ae1e9f66dcbf211bfd' + 'ac823291196c574e5c9840a001bc5ef8f951d3df619d7c689a97cf9e3a7a7d0a' + '2d588e9f25e27d8ceb8725cf068f7892359c240df3020a5750be57af96468af1' + '0f979cb6dc7988a37d6c4c91be9417366d9892c72b72ed21a4133d53adb0459f' + '2555c8ed455f89ff08da01fc1f2f8569536e6afa74cecb8a438337904ae7fa9d' + 'ec5f755388c767a5a037dab5376d3bbc350ed20edd1859ccc481cad71bb38ac1' + '7db4e75c034e2b43e3d4a5af8610fd3ac8111edea24bdcca8036e5dcbb686153' + '1ba2e3ba94969f2a24dbb09d5cdc38f210cc039ec1303d8c020fae04e633b32d' + 'e8a20ebb3c55de73689cf4bb356de42b3a65acb2e166505d56781b72cebde484' + 'bd071126f609c72bce78ae3df57cd811c43e0b30dd7e1a3b7d2dcefaa93fc3ba' + '5abb9d28373d86b2f4f54a1e069a30c2cf02cce401608e0ef4a0c239db4dcd2d' + '0c5ccb0fe96dcd3898b51d8aeeadef55eacaf1ea6f638711918e38411733ac55' + '0a5d11b0d729876f90631f58651f54070d863d0e5d5f516c5b3ce5b9e1d27626' + 'a0e5a11016dfd2570cfcc5b57ea7744a63db785b58a90a7fb18e9d8297a5f868' + '44f533591d7f45fa90153e99b7ae9839b55a5981bd011cf2462529aa1a956528' + 'f78ec012c659df4f786134185bbd078d267a90bbf1b8003c52be7fc4007dc613' + '4942d288bf54bb5d2ca171f549bc4c52da6a6ad77d56f16ab32d1869165b200f' + 'fb623363c01031940dc8cfe2960c393d684a169c819c7d549e46b4597a914123' + '2ca8e09c39758f9db426c87144e8406ba5ccea9e86e21128ad34d5b5919ec2f6' + 'e6f7b6780e01427d5dee226aca3321475360ef4fb683ba2588173b21a15a8bb1' + '32fad9a18c6eb9c3f47e7245f7bfdd318413947be16a961db167b84b5037d7e7' + 'a617e2064288ee598c60ce719e9755a78f829591a2a3b7a5086e2a72c7d50856' + '7ff56071ee5eb3173aaf4be05351d4613dedf64bd9b7f732be49e5677016a54d' + '09856a8127b58e0892f5b1f44922dafbbeda12820b80a675bc4fa9f0b08eff79' + 'df7e26edd78f2df53630620f6c4babc76f05ce6b58e1cd31fc041e23b5cf4d75' + 'a2d537419e3a04437234bd2aa7b76697a0a884b9a7cf729d700f05081f75db7b' + 'f9388ac736ebcf935bfe9ca8196323996de9e7aad7cb77533dad6a03b89f0391' + 'ce71e5ca682c9a0d74db84f420a046a58637b3607377b4ffa6bf80a76e8f839a' + '96020217c1c77465e2b6c551877a75f5a44ab121cd19023a814e3fd25eeceba2' + '41a1b4071aa40b4c6566a18abc466db2ff7d12c1e5050b31238bdd74d3aebf29' + '4e032a046bf0ba5e01c90e162dd4e0e7731db6b3f2ba28ef68bdba078e936d73' + 'ea264d5c435ad01767d829e0dbd40679937b18288a5bbd2ff79f9f274651511b' + '4329604a0f5fb47d54136aeb3f96e4c12e41529195c5eaa4ca2504e4396db051' + '3064b4a90539c3f8d60fa9421c0fb1595dec8b89e0020e81218cee02dd6ce863' + '1e04eab33f9515ac7ffafb61611013f9b230c3528f8661c1c24c8751e99b0e36' + '44006da79564048be22adbaead337e58ad2625b97d88ac36a3669528aff47bf2' + '3f2cbe2667b77af9e662de43810eb60ebb5f5551d28694f03b170952cb86df87' + 'db94344eb14bcbb35ad7fba899de519bfb680d30410e5f13d1008faf79ed8c2a' + '274d8d7f117e32c5fd29fe182125089b3f9c0266dc95f1895f8ba648fad6c520' + '0a46cdcf8b18a6e036798282caefc0e5faef8546764bb3aae1076d608396bcf0' + '2eecdd9250b41917e6307d0f8a58d32520973a7fbbe3fb0923d018dee9c9c42f' + '692b3a1e98e6eb3bcf865015eeba2ff73bb051e4ca94c286a24d11805b652c90' + '71e6c3f858936c72d61f4068f2d857bb80b521ae99dbdac9a8aebb08732632ee' + '8512f5286899f54550114149eaab207afef0db0900a00cf7f5f96b182405248a' + '0f592ddc51fabb085db64c00df8b340782316b1f8a07dd4d50f17c4426e9db76' + 'a88669b4e2054d995d4561f83703c0a3695805c9dc700ea573e087106f7668d4' + '845aade113b6de2ac96dd22b709cf77b7e18672fe58fb26028243a0a24a62e05' + 'd59612023a0092e80ca4d3c8cc19b832471e1ae8381aa696194ff8833fe3bc69' + 'aa888db76daa1398ca8a7dc4386a69ffa7d250d4a05c8d8c29fc234f6042976f' + 'bef52f43db6f9125870698ba63ef7d4102c49889283b840cb2364396870e7de7') -- cgit v1.2.3-54-g00ecf From d4077b49df7d857b7e700e57ebca5362b6735a34 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 01:17:37 -0200 Subject: calibre-2.18.0-1.parabola1: updating version --- libre/calibre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index aaa8a9aae..bf98fc7f3 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126443 2015-01-23 08:52:33Z jelle $ +# $Id: PKGBUILD 126848 2015-01-31 11:23:47Z jelle $ # Maintainer (Arch): Jelle van der Waa # Maintainer (Arch): Daniel Wallace # Contributor (Arch): Giovanni Scafora @@ -9,7 +9,7 @@ pkgname=calibre _pkgname=$pkgname-libre -pkgver=2.17.0 +pkgver=2.18.0 pkgrel=1.parabola1 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64' 'mips64el') @@ -32,8 +32,8 @@ install=$pkgname.install mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz") source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz" 'libre.patch') -mkmd5sums=('8ba11e69e241c744111a72fd172ac335') -md5sums=('507ddc1424b34d16b988a6509676932e' +mkmd5sums=('8d53dbd1d53a8a1150d85c4fb16a66da') +md5sums=('6b33827bfe30a6a59f49130d5a7fd532' '7e964e5c88affc299b69e8c2744a4393') mksource(){ -- cgit v1.2.3-54-g00ecf From 752f9bddbfeafd9a4abc0ffb71a408839ddc1f07 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 01:31:12 -0200 Subject: hplip-3.14.10-2.parabola1: don't depend on all the foomatic-db drivers - hplip ships its own drivers to be used with foomatic-db-engine --- libre/hplip/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD index 9d861ee89..d4774789b 100644 --- a/libre/hplip/PKGBUILD +++ b/libre/hplip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 224640 2014-10-16 19:13:24Z andyrtr $ +# $Id: PKGBUILD 230306 2015-01-31 09:21:51Z andyrtr $ # Maintainer (Arch): Andreas Radke # Maintainer (Arch): Tom Gundersen # Contributor (Arch): Rémy Oudompheng @@ -7,13 +7,12 @@ pkgname=hplip pkgver=3.14.10 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)" arch=('i686' 'x86_64' 'mips64el') url="http://hplipopensource.com" license=('GPL') -depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'net-snmp>=5.7.1' 'wget') +depends=('python2' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 'foomatic-db-engine') makedepends=('python2-pyqt4' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusb') optdepends=('cups: for printing support' 'python2-dbus: for dbus support' @@ -33,6 +32,7 @@ source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.as md5sums=('7af44ee1c4312b00d2269c1b25008f73' 'SKIP' 'a853ba0eb0883f4bcee00b4277128b29') +validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP prepare() { cd $pkgname-$pkgver -- cgit v1.2.3-54-g00ecf From 88cd5d1e6871b2495a67720131ea42e42d970a93 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 13:14:24 -0200 Subject: linux-libre-3.18.5_gnu-1: updating version --- libre/linux-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8af191e8a..506e2e2cc 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=3.18-gnu -_pkgver=3.18.4-gnu +_pkgver=3.18.5-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -38,7 +38,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' '2f03d1b7c6a198c3f5c1ff15583d468b93dd50d1c37d41a71075935eebb786e7' '81f1a730420c689da73554e323ca9cb4453aa20b8aeeed3864d3034b5470cc0b' -- cgit v1.2.3-54-g00ecf From 60f7478dd075f980e35af0db2a5e21e3fd7849b0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 15:53:36 -0200 Subject: rebuild module packages against linux-libre-3.18.5_gnu-1 --- libre/acpi_call/PKGBUILD | 2 +- libre/bbswitch/PKGBUILD | 2 +- libre/tp_smapi/PKGBUILD | 2 +- libre/vhba-module/PKGBUILD | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index 9285b0e80..a3654a9dd 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=19 + _archrel=20 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD index 9c555aba4..b82d2f212 100644 --- a/libre/bbswitch/PKGBUILD +++ b/libre/bbswitch/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=23 + _archrel=24 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD index a450188f9..86afab88d 100644 --- a/libre/tp_smapi/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -14,7 +14,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=60 + _archrel=61 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD index 7a269688a..cbbb74361 100644 --- a/libre/vhba-module/PKGBUILD +++ b/libre/vhba-module/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=3.18 - _archrel=3 + _archrel=4 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 -- cgit v1.2.3-54-g00ecf From dffa812fc936ec222ee9f1f9f3ee3b0155853fd6 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 16:18:10 -0200 Subject: linux-libre-lts-3.14.31_gnu-1: updating version --- libre/linux-libre-lts/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 561c04c3f..f4d25f732 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts # Build kernel with -lts localname _pkgbasever=3.14-gnu -_pkgver=3.14.30-gnu +_pkgver=3.14.31-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -42,7 +42,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '35dfc46806b6a1196c8be9fe336cf16ccd576b81268865dbf03e241c06c36ad3' + '84411639f46024e04b00f69348f619f1aebe9058125d5695afed8df8f07adb9c' 'SKIP' '7c771ed094882d9df69271f19eab456c0266db6d5f8e680f18f4b1f4b89da066' '42e5795bd25dfba1d1275bd28fc53209e18d4cf824cf7ae6c45b5ce5701800fc' -- cgit v1.2.3-54-g00ecf From 2be8ad2c33072d873c4b4d49467fe94ccf843cab Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 17:21:12 -0200 Subject: linux-libre-grsec{,-knock}-3.18.5_gnu.201501310706-1: updating version --- kernels/linux-libre-grsec-knock/PKGBUILD | 8 ++++---- libre/linux-libre-grsec/PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index 277700e78..fa193d040 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec-knock # Build kernel with -grsec-knock localname _pkgbasever=3.18-gnu -_pkgver=3.18.4-gnu +_pkgver=3.18.5-gnu _grsecver=3.0 -_timestamp=201501272307 +_timestamp=201501310706 _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -49,9 +49,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' - '655d998d6436c84e630696a94f9f53d0036fed82d5ff02119db2ab9e37db835f' + '56fbe38b2700d85c84c535c77921e77d35d389fb5eaa4c4f025327d8dd8c1225' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 2f6006f1f..6bbf091c0 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec # Build kernel with -grsec localname _pkgbasever=3.18-gnu -_pkgver=3.18.4-gnu +_pkgver=3.18.5-gnu _grsecver=3.0 -_timestamp=201501272307 +_timestamp=201501310706 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -46,9 +46,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' - '655d998d6436c84e630696a94f9f53d0036fed82d5ff02119db2ab9e37db835f' + '56fbe38b2700d85c84c535c77921e77d35d389fb5eaa4c4f025327d8dd8c1225' 'SKIP' '45486e39850926a4695bd21258d0a73333c014ff38fbfcdc78cf19298a4b1feb' '5b4f43875196306cf81f864172dc6ceaf09c2d08b44809fdf11111d217e18e17' -- cgit v1.2.3-54-g00ecf From d13de5780e16fcbe9a19a1d9f35eff247569d962 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 17:22:04 -0200 Subject: linux-libre-lts-grsec{,-knock}-3.14.31_gnu.201501310705-1: updating version --- kernels/linux-libre-lts-grsec-knock/PKGBUILD | 8 ++++---- kernels/linux-libre-lts-grsec/PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kernels/linux-libre-lts-grsec-knock/PKGBUILD b/kernels/linux-libre-lts-grsec-knock/PKGBUILD index 4432b7428..b910745e9 100644 --- a/kernels/linux-libre-lts-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-lts-grsec-knock/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-lts-grsec-knock # Build kernel with lts-grsec-knock localname _pkgbasever=3.14-gnu -_pkgver=3.14.30-gnu +_pkgver=3.14.31-gnu _grsecver=3.0 -_timestamp=201501272307 +_timestamp=201501310705 _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -53,9 +53,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '35dfc46806b6a1196c8be9fe336cf16ccd576b81268865dbf03e241c06c36ad3' + '84411639f46024e04b00f69348f619f1aebe9058125d5695afed8df8f07adb9c' 'SKIP' - '8da6bbf7eb97012e27875e0b19075bde4c5c23baff1272e7a97b449c53e5475f' + '4851704b1ee045776d0683b1d45b21b5bb118606669f122ec3014c2bad07f5a7' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index 134a5eb5b..29cd7d1b3 100644 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-lts-grsec # Build kernel with lts-grsec localname _pkgbasever=3.14-gnu -_pkgver=3.14.30-gnu +_pkgver=3.14.31-gnu _grsecver=3.0 -_timestamp=201501272307 +_timestamp=201501310705 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -50,9 +50,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '35dfc46806b6a1196c8be9fe336cf16ccd576b81268865dbf03e241c06c36ad3' + '84411639f46024e04b00f69348f619f1aebe9058125d5695afed8df8f07adb9c' 'SKIP' - '8da6bbf7eb97012e27875e0b19075bde4c5c23baff1272e7a97b449c53e5475f' + '4851704b1ee045776d0683b1d45b21b5bb118606669f122ec3014c2bad07f5a7' 'SKIP' '064ba6595f578bb09175508df8f8d824d6db9afc828f59b8e50f3f17063a134b' 'd7c0c0431e7b81d95b5239ae285b48a58fa3c9ae1fd87d990cdeb44fb27e0b3d' -- cgit v1.2.3-54-g00ecf From 5e3d055dc84bdbbf66179b52ebe8feed4e4cd835 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 17:22:48 -0200 Subject: linux-libre-knock-3.18.5_gnu-1: updating version --- kernels/linux-libre-knock/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index 6b11ca1fd..e1635203c 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-knock # Build stock knock kernel _pkgbasever=3.18-gnu -_pkgver=3.18.4-gnu +_pkgver=3.18.5-gnu _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -41,7 +41,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' -- cgit v1.2.3-54-g00ecf From e358eb03274fbda4c976c1ac9455d6e4f25dc11c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 17:23:09 -0200 Subject: linux-libre-lts-knock-3.14.31_gnu-1: updating version --- kernels/linux-libre-lts-knock/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index 7395d69a3..0aa54d850 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts-knock # Build stock -lts-knock kernel _pkgbasever=3.14-gnu -_pkgver=3.14.30-gnu +_pkgver=3.14.31-gnu _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -45,7 +45,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '35dfc46806b6a1196c8be9fe336cf16ccd576b81268865dbf03e241c06c36ad3' + '84411639f46024e04b00f69348f619f1aebe9058125d5695afed8df8f07adb9c' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' -- cgit v1.2.3-54-g00ecf From 0852d90d5049bd9ba77740dec6eb5f3afd62e976 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 17:23:40 -0200 Subject: linux-libre-{pae,xen}-3.18.5_gnu-1: updating version --- kernels/linux-libre-pae/PKGBUILD | 4 ++-- kernels/linux-libre-xen/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index d91258bf3..6c2337dd6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-pae # Build stock -pae kernel _pkgbasever=3.18-gnu -_pkgver=3.18.4-gnu +_pkgver=3.18.5-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -36,7 +36,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'change-default-console-loglevel.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' '8d255e4551bb88252ede8cc0f5046794372076da6bd97582229172537f0cc922' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 1f3fd9b0f..90301484d 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-xen # Build stock -xen kernel _pkgbasever=3.18-gnu -_pkgver=3.18.4-gnu +_pkgver=3.18.5-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -36,7 +36,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'change-default-console-loglevel.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '4dfdceef40f09da135f5ea5f22117054dc18193496ec3ea50ae0d75587723e2f' + '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' '345716983e32033e17967cb0b3a2a13bbe3aa2ccdc39ab165cb0ee7c01310e47' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' -- cgit v1.2.3-54-g00ecf From 86afce1c7f41ef6c7e5852fe3bd907a83a4fa134 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 19:40:25 -0200 Subject: pacman-4.2.0-6.parabola3: use hkp instead of hkps until solve issue -> https://labs.parabola.nu/issues/647#note-2 --- libre/pacman/PKGBUILD | 27 ++++++++++++++------------- libre/pacman/dirmngr.conf | 1 + libre/pacman/gpg.conf | 7 ++++--- 3 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 libre/pacman/dirmngr.conf diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 8ef4240df..eb04cf5b3 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -9,7 +9,7 @@ pkgname=pacman pkgver=4.2.0 -pkgrel=6.parabola2 +pkgrel=6.parabola3 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -23,16 +23,17 @@ checkdepends=('python2' 'fakechroot') provides=("$pkgname-contrib") conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') -backup=('etc/pacman.conf' 'etc/makepkg.conf') +backup=('etc/pacman.conf' 'etc/makepkg.conf' 'etc/pacman.d/gnupg/gpg.conf') options=('strip' 'debug') source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} "$pkgname.conf."{i686,x86_64,mips64el} "makepkg.conf" "pacman-4.2.0-roundup.patch" "gpg.conf" + "dirmngr.conf" + "refresh-$pkgname-keys" "sks-keyservers.netCA.pem" - "makepkg-pkgrel-4.patch" - "refresh-$pkgname-keys") + "makepkg-pkgrel-4.patch") md5sums=('184ce14f1f326fede72012cca51bba51' 'SKIP' '9c1454e48b2216b23f931e04d6dab1ee' @@ -40,10 +41,11 @@ md5sums=('184ce14f1f326fede72012cca51bba51' 'a12b1a4533c170aecc8b9b8561048248' 'ce525a9af50f1d9b824806d2e5a4f0c8' 'abe3baaf610d9cc42b4e3748c936bbce' - 'e86946908762aa44e8d3c582d4d872bb' + '65da808317595b310e59f2f395f787a9' + 'e1174020d2edf2e770857d005b7af0b9' + '093f0779ac55ae781ba028ad74b95f84' '3cfc5d2867a6672f4f629220632948f4' - '0ee98dc38ff80ba127772f5104e18e46' - '093f0779ac55ae781ba028ad74b95f84') + '0ee98dc38ff80ba127772f5104e18e46') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae prepare() { @@ -122,12 +124,11 @@ package() { install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim" - install -Dm755 "${srcdir}/refresh-pacman-keys" \ - "${pkgdir}/etc/cron.weekly/refresh-pacman-keys" + install -Dm644 "$srcdir/gpg.conf" "$pkgdir/etc/pacman.d/gnupg/gpg.conf" - install -Dm644 "${srcdir}/sks-keyservers.netCA.pem" \ - "${pkgdir}/etc/pacman.d/gnupg/sks-keyservers.netCA.pem" + install -Dm644 "$srcdir/dirmngr.conf" "$pkgdir/etc/pacman.d/gnupg/dirmngr.conf" - install -Dm644 "${srcdir}/gpg.conf" \ - "${pkgdir}/etc/pacman.d/gnupg/gpg.conf" + install -Dm755 "$srcdir/refresh-pacman-keys" "$pkgdir/etc/cron.weekly/refresh-pacman-keys" + + install -Dm644 "$srcdir/sks-keyservers.netCA.pem" "$pkgdir/etc/pacman.d/gnupg/sks-keyservers.netCA.pem" } diff --git a/libre/pacman/dirmngr.conf b/libre/pacman/dirmngr.conf new file mode 100644 index 000000000..6a724eafd --- /dev/null +++ b/libre/pacman/dirmngr.conf @@ -0,0 +1 @@ +hkp-cacert /etc/pacman.d/gnupg/sks-keyservers.netCA.pem diff --git a/libre/pacman/gpg.conf b/libre/pacman/gpg.conf index 48ce83628..ec9ef9dc1 100644 --- a/libre/pacman/gpg.conf +++ b/libre/pacman/gpg.conf @@ -18,9 +18,10 @@ default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB # From # https://crabgrass.riseup.net/riseuplabs+paow/openpgp-best-practices # Only use secure keyservers -keyserver hkps://hkps.pool.sks-keyservers.net -keyserver-options ca-cert-file=/etc/pacman.d/gnupg/sks-keyservers.netCA.pem -keyserver-options no-honor-keyserver-url +#keyserver hkps://hkps.pool.sks-keyservers.net +#keyserver-options no-honor-keyserver-url + +keyserver hkp://pool.sks-keyservers.net # when outputting certificates, view user IDs distinctly from keys: fixed-list-mode -- cgit v1.2.3-54-g00ecf From 399db66ccffe4fe3c23539d3416b949f25a77dd0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 1 Feb 2015 20:23:08 -0200 Subject: pacman-4.2.0-6.parabola4: add dirmngr.conf to backup array --- libre/pacman/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index eb04cf5b3..f846fcf09 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -9,7 +9,7 @@ pkgname=pacman pkgver=4.2.0 -pkgrel=6.parabola3 +pkgrel=6.parabola4 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -23,7 +23,8 @@ checkdepends=('python2' 'fakechroot') provides=("$pkgname-contrib") conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') -backup=('etc/pacman.conf' 'etc/makepkg.conf' 'etc/pacman.d/gnupg/gpg.conf') +backup=('etc/pacman.conf' 'etc/makepkg.conf' 'etc/pacman.d/gnupg/gpg.conf' + 'etc/pacman.d/gnupg/dirmngr.conf') options=('strip' 'debug') source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} "$pkgname.conf."{i686,x86_64,mips64el} -- cgit v1.2.3-54-g00ecf From 4008cf7899d9fe8b11fb2ebbd29338514ef3b73f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 2 Feb 2015 01:35:23 -0200 Subject: arch-install-scripts: add new package to [libre] to solve bug #662 -> https://labs.parabola.nu/issues/662 --- libre/arch-install-scripts/PKGBUILD | 36 ++++++++++++++++++++++++ libre/arch-install-scripts/copykeyring_fix.patch | 15 ++++++++++ 2 files changed, 51 insertions(+) create mode 100644 libre/arch-install-scripts/PKGBUILD create mode 100644 libre/arch-install-scripts/copykeyring_fix.patch diff --git a/libre/arch-install-scripts/PKGBUILD b/libre/arch-install-scripts/PKGBUILD new file mode 100644 index 000000000..d92f5e595 --- /dev/null +++ b/libre/arch-install-scripts/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 227573 2014-12-12 23:47:01Z dreisner $ +# Maintainer (Arch): Dave Reisner +# Maintainer: André Silva +# Maintainer: Esteban Carnevale + +pkgname=arch-install-scripts +pkgver=14 +pkgrel=1.parabola1 +pkgdesc="Scripts to aid in installing Parabola" +arch=('any') +url="https://projects.archlinux.org/arch-install-scripts.git" +license=('GPL') +depends=('bash' 'coreutils' 'pacman' 'util-linux') +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" + 'copykeyring_fix.patch') +md5sums=('fcab5a3e463413b06790969cfe09851c' + '566b8d1b0b4ac21c4040ff5171275beb') + +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir"/copykeyring_fix.patch +} + +build() { + make -C "$pkgname-$pkgver" +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/arch-install-scripts/copykeyring_fix.patch b/libre/arch-install-scripts/copykeyring_fix.patch new file mode 100644 index 000000000..cc4f3f8cd --- /dev/null +++ b/libre/arch-install-scripts/copykeyring_fix.patch @@ -0,0 +1,15 @@ +diff -Nur arch-install-scripts-14.orig/pacstrap.in arch-install-scripts-14/pacstrap.in +--- arch-install-scripts-14.orig/pacstrap.in 2014-12-12 21:43:21.000000000 -0200 ++++ arch-install-scripts-14/pacstrap.in 2015-02-02 01:21:12.998548374 -0200 +@@ -109,10 +109,7 @@ + fi + + if (( copykeyring )); then +- # if there's a keyring on the host, copy it into the new root, unless it exists already +- if [[ -d /etc/pacman.d/gnupg && ! -d $newroot/etc/pacman.d/gnupg ]]; then +- cp -a /etc/pacman.d/gnupg "$newroot/etc/pacman.d/" +- fi ++ cp -na /etc/pacman.d/gnupg/* "$newroot/etc/pacman.d/gnupg/" + fi + + if (( copymirrorlist )); then -- cgit v1.2.3-54-g00ecf From fecc0aade7375d66cc4ec468dcf904a15a5cc300 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 2 Feb 2015 02:57:33 -0200 Subject: your-freedom-20150202-1: updating version --- libre/your-freedom/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 1ff52f2c4..9dab842e3 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu license=('GPL3') url="https://projects.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20150122 -_gitver=fbb3a45d5799704a3011aa7d73a791a9f7d7f3f3 +pkgver=20150202 +_gitver=1d0d595f9534acd24e01e0fa03d91fb99eb71c06 pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver}) -md5sums=('283cfa7ac4f348ca24c6c790d740d5fc') +md5sums=('b8b1189f6ce69511df95d86a106aef11') package() { cd "$srcdir" -- cgit v1.2.3-54-g00ecf From eac23547da0bbfc69c824d21730a8a414e7e0309 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 2 Feb 2015 05:15:53 -0200 Subject: remove custom gpg.conf, dirmngr.conf and sks-keyservers.netCA.pem from pacman and remove modified arch-install-scripts package for compatibility --- libre/arch-install-scripts/PKGBUILD | 36 ----------------- libre/arch-install-scripts/copykeyring_fix.patch | 15 ------- libre/pacman/PKGBUILD | 17 +------- libre/pacman/dirmngr.conf | 1 - libre/pacman/gpg.conf | 51 ------------------------ libre/pacman/sks-keyservers.netCA.pem | 32 --------------- 6 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 libre/arch-install-scripts/PKGBUILD delete mode 100644 libre/arch-install-scripts/copykeyring_fix.patch delete mode 100644 libre/pacman/dirmngr.conf delete mode 100644 libre/pacman/gpg.conf delete mode 100644 libre/pacman/sks-keyservers.netCA.pem diff --git a/libre/arch-install-scripts/PKGBUILD b/libre/arch-install-scripts/PKGBUILD deleted file mode 100644 index d92f5e595..000000000 --- a/libre/arch-install-scripts/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 227573 2014-12-12 23:47:01Z dreisner $ -# Maintainer (Arch): Dave Reisner -# Maintainer: André Silva -# Maintainer: Esteban Carnevale - -pkgname=arch-install-scripts -pkgver=14 -pkgrel=1.parabola1 -pkgdesc="Scripts to aid in installing Parabola" -arch=('any') -url="https://projects.archlinux.org/arch-install-scripts.git" -license=('GPL') -depends=('bash' 'coreutils' 'pacman' 'util-linux') -source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" - 'copykeyring_fix.patch') -md5sums=('fcab5a3e463413b06790969cfe09851c' - '566b8d1b0b4ac21c4040ff5171275beb') - -prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i "$srcdir"/copykeyring_fix.patch -} - -build() { - make -C "$pkgname-$pkgver" -} - -check() { - make -C "$pkgname-$pkgver" check -} - -package() { - make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/arch-install-scripts/copykeyring_fix.patch b/libre/arch-install-scripts/copykeyring_fix.patch deleted file mode 100644 index cc4f3f8cd..000000000 --- a/libre/arch-install-scripts/copykeyring_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur arch-install-scripts-14.orig/pacstrap.in arch-install-scripts-14/pacstrap.in ---- arch-install-scripts-14.orig/pacstrap.in 2014-12-12 21:43:21.000000000 -0200 -+++ arch-install-scripts-14/pacstrap.in 2015-02-02 01:21:12.998548374 -0200 -@@ -109,10 +109,7 @@ - fi - - if (( copykeyring )); then -- # if there's a keyring on the host, copy it into the new root, unless it exists already -- if [[ -d /etc/pacman.d/gnupg && ! -d $newroot/etc/pacman.d/gnupg ]]; then -- cp -a /etc/pacman.d/gnupg "$newroot/etc/pacman.d/" -- fi -+ cp -na /etc/pacman.d/gnupg/* "$newroot/etc/pacman.d/gnupg/" - fi - - if (( copymirrorlist )); then diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index f846fcf09..8e4bc6740 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -9,7 +9,7 @@ pkgname=pacman pkgver=4.2.0 -pkgrel=6.parabola4 +pkgrel=6.parabola5 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -23,17 +23,13 @@ checkdepends=('python2' 'fakechroot') provides=("$pkgname-contrib") conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') -backup=('etc/pacman.conf' 'etc/makepkg.conf' 'etc/pacman.d/gnupg/gpg.conf' - 'etc/pacman.d/gnupg/dirmngr.conf') +backup=('etc/pacman.conf' 'etc/makepkg.conf') options=('strip' 'debug') source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} "$pkgname.conf."{i686,x86_64,mips64el} "makepkg.conf" "pacman-4.2.0-roundup.patch" - "gpg.conf" - "dirmngr.conf" "refresh-$pkgname-keys" - "sks-keyservers.netCA.pem" "makepkg-pkgrel-4.patch") md5sums=('184ce14f1f326fede72012cca51bba51' 'SKIP' @@ -42,10 +38,7 @@ md5sums=('184ce14f1f326fede72012cca51bba51' 'a12b1a4533c170aecc8b9b8561048248' 'ce525a9af50f1d9b824806d2e5a4f0c8' 'abe3baaf610d9cc42b4e3748c936bbce' - '65da808317595b310e59f2f395f787a9' - 'e1174020d2edf2e770857d005b7af0b9' '093f0779ac55ae781ba028ad74b95f84' - '3cfc5d2867a6672f4f629220632948f4' '0ee98dc38ff80ba127772f5104e18e46') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae @@ -125,11 +118,5 @@ package() { install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim" - install -Dm644 "$srcdir/gpg.conf" "$pkgdir/etc/pacman.d/gnupg/gpg.conf" - - install -Dm644 "$srcdir/dirmngr.conf" "$pkgdir/etc/pacman.d/gnupg/dirmngr.conf" - install -Dm755 "$srcdir/refresh-pacman-keys" "$pkgdir/etc/cron.weekly/refresh-pacman-keys" - - install -Dm644 "$srcdir/sks-keyservers.netCA.pem" "$pkgdir/etc/pacman.d/gnupg/sks-keyservers.netCA.pem" } diff --git a/libre/pacman/dirmngr.conf b/libre/pacman/dirmngr.conf deleted file mode 100644 index 6a724eafd..000000000 --- a/libre/pacman/dirmngr.conf +++ /dev/null @@ -1 +0,0 @@ -hkp-cacert /etc/pacman.d/gnupg/sks-keyservers.netCA.pem diff --git a/libre/pacman/gpg.conf b/libre/pacman/gpg.conf deleted file mode 100644 index ec9ef9dc1..000000000 --- a/libre/pacman/gpg.conf +++ /dev/null @@ -1,51 +0,0 @@ -# pacman-key default options -no-greeting -no-permission-warning -lock-never -keyserver-options timeout=20 - -# From duraconf -# personal digest preferences -personal-digest-preferences SHA512 - -# message digest algorithm used when signing a key -cert-digest-algo SHA512 - -# Set the list of default preferences to string. -# used for new keys and default for "setpref" -default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed - -# From -# https://crabgrass.riseup.net/riseuplabs+paow/openpgp-best-practices -# Only use secure keyservers -#keyserver hkps://hkps.pool.sks-keyservers.net -#keyserver-options no-honor-keyserver-url - -keyserver hkp://pool.sks-keyservers.net - -# when outputting certificates, view user IDs distinctly from keys: -fixed-list-mode - -# short-keyids are trivially spoofed; it's easy to create a long-keyid -# collision; if you care about strong key identifiers, you always want -# to see the fingerprint: -keyid-format 0xlong -fingerprint - -# when multiple digests are supported by all recipients, choose the -# strongest one: -personal-digest-preferences SHA512 SHA384 SHA256 SHA224 - -# If you use a graphical environment (and even if you don't) -# you should be using an agent: (similar arguments as -# https://www.debian-administration.org/users/dkg/weblog/64) -use-agent - -# You should always know at a glance which User IDs gpg thinks are -# legitimately bound to the keys in your keyring: -verify-options show-uid-validity -list-options show-uid-validity - -# include an unambiguous indicator of which key made a signature: (see -# http://thread.gmane.org/gmane.mail.notmuch.general/3721/focus=7234) -sig-notation issuer-fpr@notations.openpgp.fifthhorseman.net=%g diff --git a/libre/pacman/sks-keyservers.netCA.pem b/libre/pacman/sks-keyservers.netCA.pem deleted file mode 100644 index 24a2ad2e8..000000000 --- a/libre/pacman/sks-keyservers.netCA.pem +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFizCCA3OgAwIBAgIJAK9zyLTPn4CPMA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV -BAYTAk5PMQ0wCwYDVQQIDARPc2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5u -ZXQgQ0ExHjAcBgNVBAMMFXNrcy1rZXlzZXJ2ZXJzLm5ldCBDQTAeFw0xMjEwMDkw -MDMzMzdaFw0yMjEwMDcwMDMzMzdaMFwxCzAJBgNVBAYTAk5PMQ0wCwYDVQQIDARP -c2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5uZXQgQ0ExHjAcBgNVBAMMFXNr -cy1rZXlzZXJ2ZXJzLm5ldCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC -ggIBANdsWy4PXWNUCkS3L//nrd0GqN3dVwoBGZ6w94Tw2jPDPifegwxQozFXkG6I -6A4TK1CJLXPvfz0UP0aBYyPmTNadDinaB9T4jIwd4rnxl+59GiEmqkN3IfPsv5Jj -MkKUmJnvOT0DEVlEaO1UZIwx5WpfprB3mR81/qm4XkAgmYrmgnLXd/pJDAMk7y1F -45b5zWofiD5l677lplcIPRbFhpJ6kDTODXh/XEdtF71EAeaOdEGOvyGDmCO0GWqS -FDkMMPTlieLA/0rgFTcz4xwUYj/cD5e0ZBuSkYsYFAU3hd1cGfBue0cPZaQH2HYx -Qk4zXD8S3F4690fRhr+tki5gyG6JDR67aKp3BIGLqm7f45WkX1hYp+YXywmEziM4 -aSbGYhx8hoFGfq9UcfPEvp2aoc8u5sdqjDslhyUzM1v3m3ZGbhwEOnVjljY6JJLx -MxagxnZZSAY424ZZ3t71E/Mn27dm2w+xFRuoy8JEjv1d+BT3eChM5KaNwrj0IO/y -u8kFIgWYA1vZ/15qMT+tyJTfyrNVV/7Df7TNeWyNqjJ5rBmt0M6NpHG7CrUSkBy9 -p8JhimgjP5r0FlEkgg+lyD+V79H98gQfVgP3pbJICz0SpBQf2F/2tyS4rLm+49rP -fcOajiXEuyhpcmzgusAj/1FjrtlynH1r9mnNaX4e+rLWzvU5AgMBAAGjUDBOMB0G -A1UdDgQWBBTkwyoJFGfYTVISTpM8E+igjdq28zAfBgNVHSMEGDAWgBTkwyoJFGfY -TVISTpM8E+igjdq28zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAR -OXnYwu3g1ZjHyley3fZI5aLPsaE17cOImVTehC8DcIphm2HOMR/hYTTL+V0G4P+u -gH+6xeRLKSHMHZTtSBIa6GDL03434y9CBuwGvAFCMU2GV8w92/Z7apkAhdLToZA/ -X/iWP2jeaVJhxgEcH8uPrnSlqoPBcKC9PrgUzQYfSZJkLmB+3jEa3HKruy1abJP5 -gAdQvwvcPpvYRnIzUc9fZODsVmlHVFBCl2dlu/iHh2h4GmL4Da2rRkUMlbVTdioB -UYIvMycdOkpH5wJftzw7cpjsudGas0PARDXCFfGyKhwBRFY7Xp7lbjtU5Rz0Gc04 -lPrhDf0pFE98Aw4jJRpFeWMjpXUEaG1cq7D641RpgcMfPFvOHY47rvDTS7XJOaUT -BwRjmDt896s6vMDcaG/uXJbQjuzmmx3W2Idyh3s5SI0GTHb0IwMKYb4eBUIpQOnB -cE77VnCYqKvN1NVYAqhWjXbY7XasZvszCRcOG+W3FqNaHOK/n/0ueb0uijdLan+U -f4p1bjbAox8eAOQS/8a3bzkJzdyBNUKGx1BIK2IBL9bn/HravSDOiNRSnZ/R3l9G -ZauX0tu7IIDlRCILXSyeazu0aj/vdT3YFQXPcvt5Fkf5wiNTo53f72/jYEJd6qph -WrpoKqrwGwTpRUCMhYIUt65hsTxCiJJ5nKe39h46sg== ------END CERTIFICATE----- -- cgit v1.2.3-54-g00ecf From 5fd3349649cd42d75f78d7b65a36dd8f3d4146dd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 2 Feb 2015 05:18:15 -0200 Subject: your-freedom-20150202.1-1: updating version --- libre/your-freedom/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 9dab842e3..f34dfa8b0 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu license=('GPL3') url="https://projects.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20150202 -_gitver=1d0d595f9534acd24e01e0fa03d91fb99eb71c06 +pkgver=20150202.1 +_gitver=3b13525d6056c11fa6890b3ba35c13b0e98d0aa1 pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver}) -md5sums=('b8b1189f6ce69511df95d86a106aef11') +md5sums=('283cfa7ac4f348ca24c6c790d740d5fc') package() { cd "$srcdir" -- cgit v1.2.3-54-g00ecf From 8b39c9b7d9d3803c3bcca5f9755def64a912e65e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 2 Feb 2015 05:55:24 -0200 Subject: parabola-keyring-20150202-1: updating version --- libre/parabola-keyring/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 98a9a79b6..416978f0a 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: André Silva pkgname=parabola-keyring -pkgver=20140920 +pkgver=20150202 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -11,8 +11,9 @@ install=$pkgname.install source=("http://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz" "http://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz.sig") -md5sums=('a7b68a5ac179fbdb3276375514c69b11' +md5sums=('36d8d3550bcc52d2a4d98e47474a4e1f' 'SKIP') +validpgpkeys=('C92BAA713B8D53D3CAE63FC9E6974752F9704456') # André Silva package() { cd "$srcdir/$pkgname-$pkgver" -- cgit v1.2.3-54-g00ecf From 1327bd70920c62de7b0f7fa6fcc49c297fb5735b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 2 Feb 2015 17:49:05 -0200 Subject: gnuhealth: add validpgpkeys array support --- pcr/gnuhealth/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD index a85e7dff5..525ddb546 100644 --- a/pcr/gnuhealth/PKGBUILD +++ b/pcr/gnuhealth/PKGBUILD @@ -35,6 +35,7 @@ sha512sums=( f76060d334a85a7d726dbe6f2f9bc7206cf4ad7bf5abcdf143bc432411e89701320047c672bebefaeea9f92d5c31a298553f90ad35c9b2e17ae4058482cd067c SKIP ) +validpgpkeys=('14C7FD1362749706D602FBE2EADA01E3E44B8011') # Luis Falcon (meanmicio at GNU) prepare() { # fix python2 problem -- cgit v1.2.3-54-g00ecf From 9635ea7386b16d82a91538066705040c003010c4 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 2 Feb 2015 17:55:15 -0200 Subject: gnuhealth: prolix PKGBUILD --- pcr/gnuhealth/PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD index 525ddb546..db22de64c 100644 --- a/pcr/gnuhealth/PKGBUILD +++ b/pcr/gnuhealth/PKGBUILD @@ -35,7 +35,9 @@ sha512sums=( f76060d334a85a7d726dbe6f2f9bc7206cf4ad7bf5abcdf143bc432411e89701320047c672bebefaeea9f92d5c31a298553f90ad35c9b2e17ae4058482cd067c SKIP ) -validpgpkeys=('14C7FD1362749706D602FBE2EADA01E3E44B8011') # Luis Falcon (meanmicio at GNU) +validpgpkeys=( + 14C7FD1362749706D602FBE2EADA01E3E44B8011 # Luis Falcon (meanmicio at GNU) +) prepare() { # fix python2 problem -- cgit v1.2.3-54-g00ecf From 55dbd4fd38a1663b05e00c991f20186a947fdf5a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 2 Feb 2015 18:02:01 -0200 Subject: darktable-1.6.2-1.nonprism1: updating version --- nonprism/darktable/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nonprism/darktable/PKGBUILD b/nonprism/darktable/PKGBUILD index 80df511cb..c06c25538 100644 --- a/nonprism/darktable/PKGBUILD +++ b/nonprism/darktable/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125731 2015-01-11 11:54:58Z spupykin $ +# $Id: PKGBUILD 126981 2015-02-02 11:26:38Z spupykin $ # Maintainer (Arch): Sergej Pupykin # Maintainer (Arch): Christian Himpel # Contributor (Arch): Johannes Hanika pkgname=darktable -pkgver=1.6.1 -pkgrel=4.nonprism1 +pkgver=1.6.2 +pkgrel=1.nonprism1 pkgdesc="Utility to organize and develop raw images, without flickcurl support" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') install=darktable.install source=("$pkgname-$pkgver.tar.gz::https://github.com/darktable-org/darktable/archive/release-$pkgver.tar.gz") -md5sums=('86c2d90302ab1e57136d2728437db718') +md5sums=('71f786a0bfce1b72e0a28ea560684205') prepare() { cd "$srcdir/$pkgname-release-$pkgver/cmake" -- cgit v1.2.3-54-g00ecf From 4dbacf87ee65f59b5e9204f9dede5b1e6559618b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 2 Feb 2015 19:41:04 -0200 Subject: kipi-plugins-4.6.0-1.parabola1{,.nonprism1}: updating version --- libre/kipi-plugins/PKGBUILD | 18 +++++++++--------- libre/kipi-plugins/libkexiv2.patch | 10 ---------- nonprism/kipi-plugins/PKGBUILD | 18 +++++++++--------- nonprism/kipi-plugins/libkexiv2.patch | 10 ---------- 4 files changed, 18 insertions(+), 38 deletions(-) delete mode 100644 libre/kipi-plugins/libkexiv2.patch delete mode 100644 nonprism/kipi-plugins/libkexiv2.patch diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD index 1c5203899..f9c316ede 100644 --- a/libre/kipi-plugins/PKGBUILD +++ b/libre/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 229642 2015-01-22 14:42:12Z ronald $ +# $Id: PKGBUILD 230374 2015-02-02 10:16:00Z ronald $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -7,8 +7,8 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.5.0 -pkgrel=5.parabola1 +pkgver=4.6.0 +pkgrel=1.parabola1 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -29,14 +29,11 @@ optdepends=('libkgeomap: Geolocalize tool' 'qt-gstreamer: Video SlideShow plugin') options=('staticlibs') install=kipi-plugins.install -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2" - "libkexiv2.patch") -sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e' - '1bcef459bd400a04526aac9adf39d4d0a1c3549c') +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('ee4241f02e997c7b122166bc845feb885b633f0e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np0 -i "${srcdir}/libkexiv2.patch" sed -i '\|flashexport|d \|jalbumexport|d ' extra/kipi-plugins/CMakeLists.txt @@ -51,7 +48,10 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DBUILD_tests=OFF \ -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ - -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON + -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \ + -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \ + -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \ + -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON make } diff --git a/libre/kipi-plugins/libkexiv2.patch b/libre/kipi-plugins/libkexiv2.patch deleted file mode 100644 index f75b08bf7..000000000 --- a/libre/kipi-plugins/libkexiv2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- extra/CMakeLists.txt.bak 2014-11-14 20:46:49.265601687 +0100 -+++ extra/CMakeLists.txt 2014-11-14 20:46:55.555823691 +0100 -@@ -11,7 +11,6 @@ - - # from kdegraphics/libs - add_subdirectory(libkipi) -- add_subdirectory(libkexiv2) - add_subdirectory(libkdcraw) - add_subdirectory(libkface) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane) diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD index 87aed3f52..f3766eef9 100644 --- a/nonprism/kipi-plugins/PKGBUILD +++ b/nonprism/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 229642 2015-01-22 14:42:12Z ronald $ +# $Id: PKGBUILD 230374 2015-02-02 10:16:00Z ronald $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -7,8 +7,8 @@ pkgbase=digikam pkgname=kipi-plugins -pkgver=4.5.0 -pkgrel=5.parabola1.nonprism1 +pkgver=4.6.0 +pkgrel=1.parabola1.nonprism1 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -28,14 +28,11 @@ optdepends=('libkgeomap: Geolocalize tool' 'qt-gstreamer: Video SlideShow plugin') options=('staticlibs') install=kipi-plugins.install -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2" - "libkexiv2.patch") -sha1sums=('ba735f4b7bb0437c1676141ab78ea958e46f135e' - '1bcef459bd400a04526aac9adf39d4d0a1c3549c') +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('ee4241f02e997c7b122166bc845feb885b633f0e') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np0 -i "${srcdir}/libkexiv2.patch" sed -i '\|flashexport|d \|jalbumexport|d \|imageshackexport|d @@ -71,7 +68,10 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DBUILD_tests=OFF \ -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ - -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON + -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \ + -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \ + -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF \ + -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON make } diff --git a/nonprism/kipi-plugins/libkexiv2.patch b/nonprism/kipi-plugins/libkexiv2.patch deleted file mode 100644 index f75b08bf7..000000000 --- a/nonprism/kipi-plugins/libkexiv2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- extra/CMakeLists.txt.bak 2014-11-14 20:46:49.265601687 +0100 -+++ extra/CMakeLists.txt 2014-11-14 20:46:55.555823691 +0100 -@@ -11,7 +11,6 @@ - - # from kdegraphics/libs - add_subdirectory(libkipi) -- add_subdirectory(libkexiv2) - add_subdirectory(libkdcraw) - add_subdirectory(libkface) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane) -- cgit v1.2.3-54-g00ecf From 899110a5c5b23e9cee6600a84e2d335f1f5d48a6 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 3 Feb 2015 12:36:34 -0200 Subject: update blender --- libre/blender/PKGBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 0d040f508..940a34f3b 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -13,11 +13,11 @@ _git=no _gittagver=v2.73 -_gittagrev= -# blender: Tue, 20 Jan 2015 12:16:03 +0000 (23:16 +1100) -_gitcommit=58e5509d -# blender-addons: Mon, 19 Jan 2015 15:38:39 +0000 (16:38 +0100) -_gitaddonscommit=659fec7c +_gittagrev=a +# blender: Tue, 20 Jan 2015 18:16:03 +0000 (23:16 +0500) +_gitcommit=bbf09c9e +# blender-addons: Tue, 20 Jan 2015 18:15:16 +0000 (23:15 +0500) +_gitaddonscommit=ed9bd050 # blender-addons-contrib: Sat, 17 Jan 2015 09:41:03 +0000 (10:41 +0100) _gitaddonscontribcommit=a8fe7f10 # blender-translations: Tue, 13 Jan 2015 20:27:35 +0000 (21:27 +0100) @@ -25,12 +25,12 @@ _gittranslationscommit=47771dc8 pkgbase=blender pkgname=("$pkgbase" "$pkgbase-addon-gimp" "$pkgbase-addon-povray") -_pkgver=2.73 +_pkgver=2.73a _depver=${_pkgver%[a-z]} [[ $_git == no ]] && pkgver=$_pkgver [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit -pkgrel=1.parabola1 -epoch=15 +pkgrel=2.parabola1 +epoch=16 _jpgver=1.5 _llvmver=3.5 _povver=3.7 -- cgit v1.2.3-54-g00ecf From dd31fec6f73a5aa77ae31fd055d8d752dfee3182 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 3 Feb 2015 20:58:05 -0200 Subject: update mcomix --- libre/mcomix/PKGBUILD | 14 +--- libre/mcomix/libre.patch | 202 ++++++++++++++++++++--------------------------- libre/mcomix/zoom.patch | 17 ---- 3 files changed, 90 insertions(+), 143 deletions(-) delete mode 100644 libre/mcomix/zoom.patch diff --git a/libre/mcomix/PKGBUILD b/libre/mcomix/PKGBUILD index b6dd55def..27ce9f419 100644 --- a/libre/mcomix/PKGBUILD +++ b/libre/mcomix/PKGBUILD @@ -4,8 +4,8 @@ # Maintainer: André Silva pkgname=mcomix -pkgver=1.00 -pkgrel=6.parabola2 +pkgver=1.01 +pkgrel=1.parabola1 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar support" arch=('any') url="http://sourceforge.net/projects/mcomix/" @@ -17,7 +17,6 @@ conflicts=('comix' 'mcomix-libre') replaces=('comix' 'mcomix-libre') install='mcomix.install' source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2" - 'zoom.patch' 'libre.patch') prepare() { @@ -40,10 +39,6 @@ build() { do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done - - # Fix zoom in, zoom out keyboard shortcuts: - # https://sourceforge.net/p/mcomix/bugs/62/ - patch -Np1 < ${srcdir}/zoom.patch } package() { @@ -60,6 +55,5 @@ package() { install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas } -md5sums=('3a916dd9da17043ab59ccd17e26eb932' - 'c80705bf6f132bfba20dcb84b79c9cb7' - 'cbb3730d3bed153b88208163e83d60e2') +md5sums=('c2837c3baf226798246db834d22d1de8' + '6ba9f4c88c18440a48bb84a03940d4a7') diff --git a/libre/mcomix/libre.patch b/libre/mcomix/libre.patch index e3f12f703..916f46e6c 100644 --- a/libre/mcomix/libre.patch +++ b/libre/mcomix/libre.patch @@ -1,8 +1,7 @@ -diff --git a/mcomix/about_dialog.py b/mcomix/about_dialog.py -index 9f956d5..10ff0be 100644 ---- a/mcomix/about_dialog.py -+++ b/mcomix/about_dialog.py -@@ -27,7 +27,7 @@ class _AboutDialog(gtk.AboutDialog): +diff -Nur a/mcomix/about_dialog.py b/mcomix/about_dialog.py +--- a/mcomix/about_dialog.py 2014-07-20 14:41:41.000000000 -0300 ++++ b/mcomix/about_dialog.py 2015-02-03 20:06:18.707598152 -0200 +@@ -27,7 +27,7 @@ comment = \ _('%s is an image viewer specifically designed to handle comic books.') % \ constants.APPNAME + u' ' + \ @@ -11,34 +10,18 @@ index 9f956d5..10ff0be 100644 self.set_comments(comment) license = \ -diff --git a/mcomix/archive_extractor.py b/mcomix/archive_extractor.py -index afed5c7..bc969bf 100644 ---- a/mcomix/archive_extractor.py -+++ b/mcomix/archive_extractor.py -@@ -12,8 +12,8 @@ class Extractor: - - """Extractor is a threaded class for extracting different archive formats. - -- The Extractor can be loaded with paths to archives (currently ZIP, tar, -- or RAR archives) and a path to a destination directory. Once an archive -+ The Extractor can be loaded with paths to archives (currently ZIP or tar -+ archives) and a path to a destination directory. Once an archive - has been set it is possible to filter out the files to be extracted and - set the order in which they should be extracted. The extraction can - then be started in a new thread in which files are extracted one by one, -diff --git a/mcomix/archive_tools.py b/mcomix/archive_tools.py -index 66c3f14..151a904 100644 ---- a/mcomix/archive_tools.py -+++ b/mcomix/archive_tools.py -@@ -8,7 +8,6 @@ import tarfile - from mcomix import constants +diff -Nur a/mcomix/archive_tools.py b/mcomix/archive_tools.py +--- a/mcomix/archive_tools.py 2014-07-28 11:32:51.000000000 -0300 ++++ b/mcomix/archive_tools.py 2015-02-03 20:10:46.137856205 -0200 +@@ -11,7 +11,6 @@ from mcomix import log from mcomix.archive import zip + from mcomix.archive import zip_external -from mcomix.archive import rar from mcomix.archive import tar from mcomix.archive import sevenzip from mcomix.archive import lha -@@ -16,9 +15,6 @@ from mcomix.archive import lha +@@ -20,9 +19,6 @@ def szip_available(): return sevenzip.SevenZipArchive.is_available() @@ -48,7 +31,7 @@ index 66c3f14..151a904 100644 def lha_available(): return lha.LhaArchive.is_available() or szip_available() -@@ -31,9 +27,6 @@ def get_supported_archive_regex(): +@@ -35,9 +31,6 @@ if szip_available(): formats.extend(constants.SZIP_FORMATS[1]) @@ -58,44 +41,43 @@ index 66c3f14..151a904 100644 if lha_available(): formats.extend(constants.LHA_FORMATS[1]) -@@ -71,10 +64,7 @@ def archive_mime_type(path): +@@ -81,10 +74,7 @@ else: return constants.TAR -- if magic == 'Rar!': +- if magic[0:4] == 'Rar!': - return constants.RAR - -- elif magic == '7z\xBC\xAF': -+ if magic == '7z\xBC\xAF': +- elif magic[0:4] == '7z\xBC\xAF': ++ if magic[0:4] == '7z\xBC\xAF': return constants.SEVENZIP - elif magic[2:] == '-l': -@@ -124,11 +114,6 @@ def get_archive_handler(path): - return zip.ZipArchive(path) - elif mime in (constants.TAR, constants.GZIP, constants.BZIP2): + # Headers for TAR-XZ and TAR-LZMA that aren't supported by tarfile +@@ -143,11 +133,6 @@ + return sevenzip.SevenZipArchive(path) + elif type in (constants.TAR, constants.GZIP, constants.BZIP2): return tar.TarArchive(path) -- elif mime == constants.RAR and rar.RarArchive.is_available(): +- elif type == constants.RAR and rar.RarArchive.is_available(): - return rar.RarArchive(path) -- elif mime == constants.RAR and sevenzip.SevenZipArchive.is_available(): +- elif type == constants.RAR and sevenzip.SevenZipArchive.is_available(): - log.info('Using Sevenzip for RAR archives.') - return sevenzip.SevenZipArchive(path) - elif mime == constants.SEVENZIP and sevenzip.SevenZipArchive.is_available(): + elif type == constants.SEVENZIP and sevenzip.SevenZipArchive.is_available(): return sevenzip.SevenZipArchive(path) - elif mime == constants.LHA and lha.LhaArchive.is_available(): -diff --git a/mcomix/constants.py b/mcomix/constants.py -index fad3b78..3c225c5 100644 ---- a/mcomix/constants.py -+++ b/mcomix/constants.py -@@ -28,7 +28,7 @@ FILEINFO_PICKLE_PATH = os.path.join(DATA_DIR, 'file.pickle') - PREFERENCE_PICKLE_PATH = os.path.join(CONFIG_DIR, 'preferences.pickle') + elif type == constants.LHA and lha.LhaArchive.is_available(): +diff -Nur a/mcomix/constants.py b/mcomix/constants.py +--- a/mcomix/constants.py 2015-01-31 06:06:26.000000000 -0200 ++++ b/mcomix/constants.py 2015-02-03 20:11:54.983850230 -0200 +@@ -41,7 +41,7 @@ + LAST_INDEX = -1 + UNION_INDEX = -2 - ZOOM_MODE_BEST, ZOOM_MODE_WIDTH, ZOOM_MODE_HEIGHT, ZOOM_MODE_MANUAL, ZOOM_MODE_SIZE = range(5) --ZIP, RAR, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA = range(8) -+ZIP, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA = range(7) +-ZIP, RAR, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA, ZIP_EXTERNAL = range(9) ++ZIP, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA, ZIP_EXTERNAL = range(8) NORMAL_CURSOR, GRAB_CURSOR, WAIT_CURSOR, NO_CURSOR = range(4) LIBRARY_DRAG_EXTERNAL_ID, LIBRARY_DRAG_BOOK_ID, LIBRARY_DRAG_COLLECTION_ID = range(3) AUTOROTATE_NEVER, AUTOROTATE_WIDTH_90, AUTOROTATE_WIDTH_270, \ -@@ -57,9 +57,6 @@ SUPPORTED_IMAGE_REGEX = re.compile(r'\.(jpg|jpeg|png|gif|tif|tiff|bmp|ppm|pgm|pb +@@ -70,9 +70,6 @@ ZIP_FORMATS = ( ('application/x-zip', 'application/zip', 'application/x-zip-compressed', 'application/x-cbz'), ('*.zip', '*.cbz')) @@ -105,11 +87,10 @@ index fad3b78..3c225c5 100644 TAR_FORMATS = ( ('application/x-tar', 'application/x-gzip', 'application/x-bzip2', 'application/x-cbt'), ('*.tar', '*.gz', '*.bz2', '*.bzip2', '*.cbt')) -diff --git a/mcomix/file_chooser_base_dialog.py b/mcomix/file_chooser_base_dialog.py -index 4d2a34e..c518842 100644 ---- a/mcomix/file_chooser_base_dialog.py -+++ b/mcomix/file_chooser_base_dialog.py -@@ -88,9 +88,6 @@ class _BaseFileChooserDialog(gtk.Dialog): +diff -Nur a/mcomix/file_chooser_base_dialog.py b/mcomix/file_chooser_base_dialog.py +--- a/mcomix/file_chooser_base_dialog.py 2014-01-18 06:01:42.000000000 -0200 ++++ b/mcomix/file_chooser_base_dialog.py 2015-02-03 20:13:45.971467307 -0200 +@@ -88,9 +88,6 @@ # extractor availability. mimetypes = constants.ZIP_FORMATS[0] + constants.TAR_FORMATS[0] patterns = constants.ZIP_FORMATS[1] + constants.TAR_FORMATS[1] @@ -119,7 +100,7 @@ index 4d2a34e..c518842 100644 if archive_tools.szip_available(): mimetypes += constants.SZIP_FORMATS[0] patterns += constants.SZIP_FORMATS[1] -@@ -107,10 +104,6 @@ class _BaseFileChooserDialog(gtk.Dialog): +@@ -107,10 +104,6 @@ self.add_filter(_('Tar archives'), *constants.TAR_FORMATS) @@ -130,11 +111,10 @@ index 4d2a34e..c518842 100644 if archive_tools.szip_available(): self.add_filter(_('7z archives'), *constants.SZIP_FORMATS) -diff --git a/mcomix/messages/mcomix.pot b/mcomix/messages/mcomix.pot -index 54ece85..482c051 100644 ---- a/mcomix/messages/mcomix.pot -+++ b/mcomix/messages/mcomix.pot -@@ -24,7 +24,7 @@ msgid "%s is an image viewer specifically designed to handle comic books." +diff -Nur a/mcomix/messages/mcomix.pot b/mcomix/messages/mcomix.pot +--- a/mcomix/messages/mcomix.pot 2015-01-31 05:55:44.000000000 -0200 ++++ b/mcomix/messages/mcomix.pot 2015-02-03 20:32:26.271598749 -0200 +@@ -24,7 +24,7 @@ msgstr "" #: mcomix/about_dialog.py:30 @@ -143,7 +123,7 @@ index 54ece85..482c051 100644 msgstr "" #: mcomix/about_dialog.py:34 -@@ -241,10 +241,6 @@ msgstr "" +@@ -242,10 +242,6 @@ msgid "Tar archives" msgstr "" @@ -154,7 +134,7 @@ index 54ece85..482c051 100644 #: mcomix/file_chooser_base_dialog.py:115 msgid "7z archives" msgstr "" -@@ -1345,10 +1341,6 @@ msgstr "" +@@ -1568,10 +1564,6 @@ msgid "Bzip2 compressed tar archive" msgstr "" @@ -165,11 +145,10 @@ index 54ece85..482c051 100644 #: mcomix/strings.py:14 msgid "7z archive" msgstr "" -diff --git a/mcomix/process.py b/mcomix/process.py -index 4ba60c6..c37699d 100644 ---- a/mcomix/process.py -+++ b/mcomix/process.py -@@ -10,10 +10,7 @@ from mcomix import i18n +diff -Nur a/mcomix/process.py b/mcomix/process.py +--- a/mcomix/process.py 2014-07-25 13:37:00.000000000 -0300 ++++ b/mcomix/process.py 2015-02-03 20:16:10.747046736 -0200 +@@ -20,10 +20,7 @@ class Process: """The subprocess and popen2 modules in Python are broken (see issue @@ -181,11 +160,10 @@ index 4ba60c6..c37699d 100644 """ # TODO: I can no longer reproduce the issue. Check if this version of # process.py still solves it. -diff --git a/mcomix/recent.py b/mcomix/recent.py -index 3d4613d..3f5c511 100644 ---- a/mcomix/recent.py -+++ b/mcomix/recent.py -@@ -30,8 +30,7 @@ class RecentFilesMenu(gtk.RecentChooserMenu): +diff -Nur a/mcomix/recent.py b/mcomix/recent.py +--- a/mcomix/recent.py 2014-06-09 03:08:26.000000000 -0300 ++++ b/mcomix/recent.py 2015-02-03 20:17:14.779514387 -0200 +@@ -31,8 +31,7 @@ rfilter.add_pixbuf_formats() mimetypes, patterns = itertools.izip(constants.ZIP_FORMATS, @@ -195,10 +173,9 @@ index 3d4613d..3f5c511 100644 for mimetype in itertools.chain.from_iterable(mimetypes): rfilter.add_mime_type(mimetype) -diff --git a/mcomix/strings.py b/mcomix/strings.py -index c5ca21f..cc69236 100644 ---- a/mcomix/strings.py -+++ b/mcomix/strings.py +diff -Nur a/mcomix/strings.py b/mcomix/strings.py +--- a/mcomix/strings.py 2014-01-18 06:01:42.000000000 -0200 ++++ b/mcomix/strings.py 2015-02-03 20:18:10.421674128 -0200 @@ -3,14 +3,13 @@ This file should only be imported after gettext has been correctly initialized and installed in the global namespace. """ @@ -215,20 +192,19 @@ index c5ca21f..cc69236 100644 SEVENZIP: _('7z archive'), LHA: _('LHA archive') } -diff --git a/mcomix.egg-info/SOURCES.txt b/mcomix.egg-info/SOURCES.txt -index 62de3ad..85a65df 100644 ---- a/mcomix.egg-info/SOURCES.txt -+++ b/mcomix.egg-info/SOURCES.txt -@@ -77,8 +77,6 @@ mcomix.egg-info/top_level.txt - mcomix/archive/__init__.py - mcomix/archive/archive_base.py +diff -Nur a/mcomix.egg-info/SOURCES.txt b/mcomix.egg-info/SOURCES.txt +--- a/mcomix.egg-info/SOURCES.txt 2015-01-31 06:08:19.000000000 -0200 ++++ b/mcomix.egg-info/SOURCES.txt 2015-02-03 20:19:25.537920559 -0200 +@@ -84,8 +84,6 @@ + mcomix/archive/archive_recursive.py mcomix/archive/lha.py + mcomix/archive/pdf.py -mcomix/archive/rar.py -mcomix/archive/rarfile.py mcomix/archive/sevenzip.py mcomix/archive/tar.py mcomix/archive/zip.py -@@ -183,18 +181,13 @@ mime/comicthumb.1.gz +@@ -184,18 +182,13 @@ mime/mcomix.desktop mime/mcomix.thumbnailer mime/mcomix.xml @@ -249,10 +225,9 @@ index 62de3ad..85a65df 100644 -mime/icons/48x48/application-x-cbz.png \ No newline at end of file +mime/icons/48x48/application-x-cbz.png -diff --git a/mime/comicbook.schemas b/mime/comicbook.schemas -index cdc4a4a..21b6214 100644 ---- a/mime/comicbook.schemas -+++ b/mime/comicbook.schemas +diff -Nur a/mime/comicbook.schemas b/mime/comicbook.schemas +--- a/mime/comicbook.schemas 2013-01-08 14:26:46.000000000 -0200 ++++ b/mime/comicbook.schemas 2015-02-03 20:20:10.809688373 -0200 @@ -1,28 +1,6 @@ @@ -282,11 +257,10 @@ index cdc4a4a..21b6214 100644 /schemas/desktop/gnome/thumbnailers/application@x-cbz/enable /desktop/gnome/thumbnailers/application@x-cbz/enable comicthumb -diff --git a/mime/comicthumb b/mime/comicthumb -index 5728e2a..d77a4a1 100755 ---- a/mime/comicthumb -+++ b/mime/comicthumb -@@ -7,7 +7,7 @@ comicthumb is dependent on the Python Imaging Library (PIL). +diff -Nur a/mime/comicthumb b/mime/comicthumb +--- a/mime/comicthumb 2013-01-13 14:35:00.000000000 -0200 ++++ b/mime/comicthumb 2015-02-03 20:22:30.481808283 -0200 +@@ -7,7 +7,7 @@ comicthumb was originally written by Christoph Wolk, this version was re-written from scratch for Comix 4 by Pontus Ekberg. @@ -295,7 +269,7 @@ index 5728e2a..d77a4a1 100755 Usage: comicthumb INFILE OUTFILE [SIZE] """ -@@ -28,16 +28,13 @@ except ImportError: +@@ -28,16 +28,13 @@ print __doc__ sys.exit(1) @@ -314,7 +288,7 @@ index 5728e2a..d77a4a1 100755 """ # TODO: I can no longer reproduce the issue. Check if this version of # process.py still solves it. -@@ -94,19 +91,6 @@ class Extractor: +@@ -94,19 +91,6 @@ elif self._type in [TAR, GZIP, BZIP2]: self._tfile = tarfile.open(src, 'r') self._files = self._tfile.getnames() @@ -334,7 +308,7 @@ index 5728e2a..d77a4a1 100755 def get_files(self): """Return a list of the files in the archive.""" -@@ -121,11 +105,6 @@ class Extractor: +@@ -121,11 +105,6 @@ return cStringIO.StringIO(self._zfile.read(chosen)) elif self._type in [TAR, GZIP, BZIP2]: return cStringIO.StringIO(self._tfile.extractfile(chosen).read()) @@ -346,7 +320,7 @@ index 5728e2a..d77a4a1 100755 def archive_mime_type(path): -@@ -145,8 +124,6 @@ def archive_mime_type(path): +@@ -145,8 +124,6 @@ if magic.startswith('\037\213'): return GZIP return TAR @@ -355,30 +329,27 @@ index 5728e2a..d77a4a1 100755 except Exception: print '! Error while reading', path return None -diff --git a/mime/mcomix.desktop b/mime/mcomix.desktop -index ee6d8b9..19ec7cd 100644 ---- a/mime/mcomix.desktop -+++ b/mime/mcomix.desktop -@@ -19,4 +19,4 @@ Terminal=false +diff -Nur a/mime/mcomix.desktop b/mime/mcomix.desktop +--- a/mime/mcomix.desktop 2013-01-08 14:26:46.000000000 -0200 ++++ b/mime/mcomix.desktop 2015-02-03 20:24:12.805803236 -0200 +@@ -19,4 +19,4 @@ Type=Application StartupNotify=true Categories=Graphics;Viewer; -MimeType=application/x-cbz;application/x-cbr;application/x-cbt;image/jpeg;image/png;image/gif;image/tiff;image/bmp;image/x-icon;image/x-xpixmap;image/x-xbitmap;application/x-zip;application/zip;application/x-rar;application/x-tar;application/x-gzip;application/x-bzip2;image/svg+xml;image/svg;image/svg-xml;image/vnd.adobe.svg+xml;text/xml-svg;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-pcx;image/x-cmu-raster;image/x-sun-raster;image/x-tga;application/x-7z-compressed;application/x-cb7;application/x-lzh;application/x-lha;application/x-lzh-compressed; +MimeType=application/x-cbz;application/x-cbt;image/jpeg;image/png;image/gif;image/tiff;image/bmp;image/x-icon;image/x-xpixmap;image/x-xbitmap;application/x-zip;application/zip;application/x-tar;application/x-gzip;application/x-bzip2;image/svg+xml;image/svg;image/svg-xml;image/vnd.adobe.svg+xml;text/xml-svg;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-pcx;image/x-cmu-raster;image/x-sun-raster;image/x-tga;application/x-7z-compressed;application/x-cb7;application/x-lzh;application/x-lha;application/x-lzh-compressed; -diff --git a/mime/mcomix.thumbnailer b/mime/mcomix.thumbnailer -index 4dcfc67..667dc8b 100644 ---- a/mime/mcomix.thumbnailer -+++ b/mime/mcomix.thumbnailer +diff -Nur a/mime/mcomix.thumbnailer b/mime/mcomix.thumbnailer +--- a/mime/mcomix.thumbnailer 2014-01-18 06:01:42.000000000 -0200 ++++ b/mime/mcomix.thumbnailer 2015-02-03 20:27:12.596127651 -0200 @@ -1,4 +1,4 @@ [Thumbnailer Entry] TryExec=comicthumb Exec=comicthumb %u %o %s -MimeType=application/x-cbr;application/x-cbz;application/x-cbt; +MimeType=application/x-cbz;application/x-cbt; -diff --git a/mime/mcomix.xml b/mime/mcomix.xml -index 765c254..b13e2da 100644 ---- a/mime/mcomix.xml -+++ b/mime/mcomix.xml +diff -Nur a/mime/mcomix.xml b/mime/mcomix.xml +--- a/mime/mcomix.xml 2013-01-08 14:26:46.000000000 -0200 ++++ b/mime/mcomix.xml 2015-02-03 20:27:36.940405337 -0200 @@ -5,11 +5,6 @@ Comic Book Archive (Zip compressed) @@ -391,11 +362,10 @@ index 765c254..b13e2da 100644 -diff --git a/setup.py b/setup.py -index 9eb7782..9979111 100755 ---- a/setup.py -+++ b/setup.py -@@ -78,23 +78,18 @@ setuptools.setup( +diff -Nur a/setup.py b/setup.py +--- a/setup.py 2014-06-09 03:08:26.000000000 -0300 ++++ b/setup.py 2015-02-03 20:28:30.005795579 -0200 +@@ -79,23 +79,18 @@ ('share/icons/hicolor/48x48/apps', ['mcomix/images/48x48/mcomix.png']), ('share/icons/hicolor/16x16/mimetypes', ['mime/icons/16x16/application-x-cbz.png', diff --git a/libre/mcomix/zoom.patch b/libre/mcomix/zoom.patch deleted file mode 100644 index 26dc3ba6f..000000000 --- a/libre/mcomix/zoom.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/mcomix-1.00/mcomix/event.py b/mcomix-1.00-mod/mcomix/event.py -index bc8cf79..bf80ec2 100644 ---- a/mcomix/event.py -+++ b/mcomix/event.py -@@ -117,8 +117,11 @@ class EventHandler: - - # Zooming commands for manual zoom mode - manager.register('zoom in', -- ['equal'], -+ ['plus', 'KP_Add', 'equal'], - self._window.actiongroup.get_action('zoom_in').activate) -+ manager.register('zoom out', -+ ['minus', 'KP_Subtract'], -+ self._window.actiongroup.get_action('zoom_out').activate) - # Zoom out is already defined as GTK menu hotkey - manager.register('zoom original', - ['KP_0'], -- cgit v1.2.3-54-g00ecf From 22a280812f97d43c3956df3170ad41c88a922f3d Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 3 Feb 2015 21:04:01 -0200 Subject: update icecat-noscript --- libre/icecat-noscript/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index b7486ba2b..ea64ffdd5 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva pkgname=icecat-noscript -pkgver=2.6.9.10 +pkgver=2.6.9.11 pkgrel=1 pkgdesc="Extension for icecat which disables script" arch=('any') @@ -12,7 +12,7 @@ license=('GPL2') depends=() makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('00c000b25f89d14c84ce18819c4f5280') +md5sums=('9b810e4d908cf64f008c902feda01b11') package() { depends=("icecat") -- cgit v1.2.3-54-g00ecf From 4c041916d42462d92f3cf67dc29e77457447f968 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 3 Feb 2015 21:05:51 -0200 Subject: update iceweasel-noscript --- libre/iceweasel-noscript/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 74bbfc087..646f900df 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva pkgname=iceweasel-noscript -pkgver=2.6.9.10 +pkgver=2.6.9.11 pkgrel=1 pkgdesc="Extension for iceweasel which disables script" arch=('any') @@ -12,7 +12,7 @@ license=('GPL2') depends=() makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('00c000b25f89d14c84ce18819c4f5280') +md5sums=('9b810e4d908cf64f008c902feda01b11') package() { depends=("iceweasel") -- cgit v1.2.3-54-g00ecf From caa09b59b12a27f94550feec0d42eb7cb788c777 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 4 Feb 2015 03:15:03 -0200 Subject: update linux-libre-grsec --- libre/linux-libre-grsec/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 6bbf091c0..1f2b7c79f 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -14,7 +14,7 @@ pkgbase=linux-libre-grsec # Build kernel with -grsec localname _pkgbasever=3.18-gnu _pkgver=3.18.5-gnu _grsecver=3.0 -_timestamp=201501310706 +_timestamp=201502021854 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -48,7 +48,7 @@ sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' - '56fbe38b2700d85c84c535c77921e77d35d389fb5eaa4c4f025327d8dd8c1225' + '278ac180071745f8bb418537e13bba5d791bd6e346602c5c240bee8cdfadc778' 'SKIP' '45486e39850926a4695bd21258d0a73333c014ff38fbfcdc78cf19298a4b1feb' '5b4f43875196306cf81f864172dc6ceaf09c2d08b44809fdf11111d217e18e17' -- cgit v1.2.3-54-g00ecf From 0e94a85e95d05d58a85bacedf0316bfda52cf0cd Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 4 Feb 2015 22:16:23 -0200 Subject: update kdelibs --- libre/kdelibs/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD index bff7e114b..8cf7eb24e 100644 --- a/libre/kdelibs/PKGBUILD +++ b/libre/kdelibs/PKGBUILD @@ -5,8 +5,8 @@ # Maintainer: André Silva pkgname=kdelibs -pkgver=4.14.4 -_kdeappver=14.12.1 +pkgver=4.14.5 +_kdeappver=14.12.2 pkgrel=1.parabola1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch') -sha1sums=('8e5b35ac26a3ee65331ead30d0d9f192534a02d3' +sha1sums=('92e4b13e41f946de0d647331f31ad83f4921c99a' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' 'ed1f57ee661e5c7440efcaba7e51d2554709701c') -- cgit v1.2.3-54-g00ecf From 777e9c02b7a8428b930560c8ca20fdfbe0bb9de2 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 00:11:23 -0200 Subject: update kdebase-runtime --- libre/kdebase-runtime/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD index 62941891f..ceb186485 100644 --- a/libre/kdebase-runtime/PKGBUILD +++ b/libre/kdebase-runtime/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: André Silva pkgname=kdebase-runtime -pkgver=14.12.1 +pkgver=14.12.2 pkgrel=1.parabola1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ install="${pkgname}.install" source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('5f6e1e5ac3dcb7a42a945d003881ab47756a940b' +sha1sums=('96811840cb04a879109739f3df4f8075fb876ea7' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') -- cgit v1.2.3-54-g00ecf From 00130abe013afb99e6a698f10e1b4eb241e910f8 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 00:24:18 -0200 Subject: update kdeutils-ark --- libre/kdeutils-ark/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/kdeutils-ark/PKGBUILD b/libre/kdeutils-ark/PKGBUILD index 6f906883e..8db8ca179 100644 --- a/libre/kdeutils-ark/PKGBUILD +++ b/libre/kdeutils-ark/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva pkgname=kdeutils-ark -pkgver=14.12.1 +pkgver=14.12.2 pkgrel=1.parabola1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -18,7 +18,7 @@ optdepends=('p7zip' 'zip' 'unzip' 'unar') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('df0764ce3c32358c4b1c7515d57431f4707f9da4' +sha1sums=('a027bb9ce7eaa513a8349f9eced8b9f43d38c4a3' 'a0a836950f185d9b2245204579f969203036fdec') prepare() { -- cgit v1.2.3-54-g00ecf From 5646104b92c0d90e6947eaaf2a9810c6ff261946 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 00:56:32 -0200 Subject: update kdebase-konqueror --- libre/kdebase-konqueror/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD index f99a736c1..5c40e1c4a 100644 --- a/libre/kdebase-konqueror/PKGBUILD +++ b/libre/kdebase-konqueror/PKGBUILD @@ -5,8 +5,8 @@ # Maintainer: André Silva pkgname='kdebase-konqueror' -pkgver=14.12.1 -pkgrel=2.parabola1 +pkgver=14.12.2 +pkgrel=1.parabola1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') @@ -16,7 +16,7 @@ replaces=('kdebase-nsplugins' 'kdebase-konqueror-libre') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets') source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'konq-about-fsdg.diff') -sha1sums=('fefc86d7fb176689012f4ee8710f715a68c899f9' +sha1sums=('62e1d92623d13e97eed086c79b9765627fbefd8b' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') -- cgit v1.2.3-54-g00ecf From 15c2943f4bea35d9fceb8d921959b484d164b1e0 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 01:00:10 -0200 Subject: update kdenetwork-kopete --- libre/kdenetwork-kopete/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD index 575bbb4cf..5ca76e9ff 100644 --- a/libre/kdenetwork-kopete/PKGBUILD +++ b/libre/kdenetwork-kopete/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva pkgname=kdenetwork-kopete -pkgver=14.12.1 +pkgver=14.12.2 pkgrel=1.parabola1 pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' @@ -17,7 +17,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn' makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('bf5c8b45c6706ed26e5257817e838fd538033aa2') +sha1sums=('c8cfff62cfda2575f0dfeb1bc7248ebcece7092a') prepare() { cd kopete-${pkgver} -- cgit v1.2.3-54-g00ecf From c48fa066b334fcb42b283b86939b8a3e619101a3 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 01:02:44 -0200 Subject: update kdenetwork-kopete (nonprism) --- nonprism/kdenetwork-kopete/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD index b89ef6d39..ea1193b42 100644 --- a/nonprism/kdenetwork-kopete/PKGBUILD +++ b/nonprism/kdenetwork-kopete/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: André Silva pkgname=kdenetwork-kopete -pkgver=14.12.1 +pkgver=14.12.2 pkgrel=1.parabola1.nonprism1 pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' @@ -18,7 +18,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libre-nonprism.patch') -sha1sums=('bf5c8b45c6706ed26e5257817e838fd538033aa2' +sha1sums=('c8cfff62cfda2575f0dfeb1bc7248ebcece7092a' 'f0d7b727da1b5160f05952eec4df1bfbefab99cf') prepare() { -- cgit v1.2.3-54-g00ecf From 0ee7500e24165810e087dffb885795acee332432 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 01:27:56 -0200 Subject: update kdepim-runtime --- nonprism/kdepim-runtime/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD index aff2c8f94..ac35b064f 100644 --- a/nonprism/kdepim-runtime/PKGBUILD +++ b/nonprism/kdepim-runtime/PKGBUILD @@ -4,8 +4,8 @@ # Maintainer: André Silva pkgname=kdepim-runtime -pkgver=4.14.4 -_kdeappver=14.12.1 +pkgver=4.14.5 +_kdeappver=14.12.2 pkgrel=1.nonprism1 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install="${pkgname}.install" replaces=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') conflicts=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('36bf4f5c652538410bb33d2f938942e5f224bf5f') +sha1sums=('1a99ed02330e45950249debfed599416cbd49c0a') prepare() { mkdir build -- cgit v1.2.3-54-g00ecf From ad4ad08454954f40c0220f433e1d65e33cbf96ae Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 02:08:38 -0200 Subject: update kdepim --- nonprism/kdepim/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD index e2cdaeb2c..0bcc90a08 100644 --- a/nonprism/kdepim/PKGBUILD +++ b/nonprism/kdepim/PKGBUILD @@ -12,8 +12,8 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-knotes' 'kdepim-korganizer' 'kdepim-libkdepim') -pkgver=4.14.4 -_kdeappver=14.12.1 +pkgver=4.14.5 +_kdeappver=14.12.2 pkgrel=1.nonprism1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'baloo4' 'grantlee-qt4') source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('9301b2acf2fc73f23008905450ad0eb231fed1bf') +sha1sums=('36a48f9483982bde79ade85f150983a44002866d') build() { mkdir build -- cgit v1.2.3-54-g00ecf From 457b1baab9415b94e235f7550b66399b959648de Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 12:57:58 -0200 Subject: kdepim-kmail: fix depends and optdepends --- nonprism/kdepim/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD index 0bcc90a08..9c6f8e085 100644 --- a/nonprism/kdepim/PKGBUILD +++ b/nonprism/kdepim/PKGBUILD @@ -79,7 +79,8 @@ package_kdepim-kjots() { package_kdepim-kmail() { pkgdesc='Mail Client, without Google Drive support' - depends=('kdepim-libkdepim' 'kde-agent') + depends=('kdepim-libkdepim') + optdepends=('kde-agent: For starting and shutting down gpg-agent with KDE session manager') url="http://kde.org/applications/internet/kmail/" install='kdepim-kmail.install' conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' -- cgit v1.2.3-54-g00ecf From 30081accae444d986091717b86448703a109b859 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 13:21:58 -0200 Subject: update gummiboot --- libre/gummiboot/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index 018326c57..8b8d6e482 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: André Silva pkgname=gummiboot -pkgver=45 +pkgver=48 pkgrel=1.parabola1 pkgdesc="Simple UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" @@ -14,9 +14,9 @@ arch=('x86_64' 'i686' 'mips64el') license=('LGPL2.1') makedepends=('gnu-efi-libs' 'docbook-xsl' 'git') depends=('util-linux') -replaces=('gummiboot-efi' "${pkgname}-parabola") conflicts=('gummiboot-efi' "${pkgname}-parabola") provides=('gummiboot-efi') +replaces=('gummiboot-efi' "${pkgname}-parabola") options=('!strip' '!makeflags') source=("git://anongit.freedesktop.org/$pkgname#tag=$pkgver" 'loader.conf' -- cgit v1.2.3-54-g00ecf From 246a5750a19f080b3b0284303cdf966a14d4898f Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 13:29:25 -0200 Subject: gummiboot: mips64el doesn't support UEFI --- libre/gummiboot/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index 8b8d6e482..935ca32da 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -10,7 +10,7 @@ pkgver=48 pkgrel=1.parabola1 pkgdesc="Simple UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" -arch=('x86_64' 'i686' 'mips64el') +arch=('x86_64' 'i686') license=('LGPL2.1') makedepends=('gnu-efi-libs' 'docbook-xsl' 'git') depends=('util-linux') -- cgit v1.2.3-54-g00ecf From 748d383af42895f4cd0911b47597ab3e5ae1bd26 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 13:37:52 -0200 Subject: update cups-filters --- libre/cups-filters/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD index bf082e481..be53a6116 100644 --- a/libre/cups-filters/PKGBUILD +++ b/libre/cups-filters/PKGBUILD @@ -3,7 +3,7 @@ pkgname=cups-filters pkgver=1.0.62 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -- cgit v1.2.3-54-g00ecf From ffd8c88f10414ddb622fdd3ba15ac2a9b2c24715 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 14:02:41 -0200 Subject: rebuild clementine --- libre/clementine/PKGBUILD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD index 3609ec141..feebd4690 100644 --- a/libre/clementine/PKGBUILD +++ b/libre/clementine/PKGBUILD @@ -10,14 +10,15 @@ pkgname=clementine _pkgname=$pkgname-libre pkgver=1.2.3 -pkgrel=4.parabola1 +pkgrel=5.parabola1 pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support' url="http://www.$pkgname-player.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') replaces=("$_pkgname") conflicts=("$_pkgname") -depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-ossl' 'taglib') +depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' + 'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-ossl' 'taglib') makedepends=('cmake' 'boost' 'mesa' 'sparsehash') optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' 'gstreamer0.10-good-plugins: "Good" plugin libraries' @@ -76,7 +77,9 @@ build() { fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' make } -- cgit v1.2.3-54-g00ecf From 9dbd3e46993fe26774d9da4aecdbdd40fd69d382 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 16:44:22 -0200 Subject: update pcsx2 --- libre-multilib/pcsx2/PKGBUILD | 60 ++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/libre-multilib/pcsx2/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD index 462310975..3c661d70f 100644 --- a/libre-multilib/pcsx2/PKGBUILD +++ b/libre-multilib/pcsx2/PKGBUILD @@ -4,23 +4,27 @@ # Contributor (Arch): vEX pkgname=pcsx2 -pkgver=1.2.2 -pkgrel=3.parabola1 +pkgver=1.3.1 +pkgrel=1.parabola1 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url='http://www.pcsx2.net' license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3') -makedepends=('cmake' 'sparsehash') -if [[ $CARCH == "i686" ]]; then - depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk2.8') -elif [[ $CARCH == "x86_64" ]]; then - makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') -fi +depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' + 'portaudio' 'sdl' 'soundtouch' 'wxgtk') +depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' + 'lib32-libjpeg-turbo' + 'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk') +makedepends=('cmake') +makedepends_x86_64=('gcc-multilib') +optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support' + 'lib32-gtk-engine-murrine: Murrine GTK3 engine support' + 'lib32-gtk-engine-unico: Unico GTK2 engine support') conflicts=("${pkgname}-libre") replaces=("${pkgname}-libre") options=('!emptydirs') source=("https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz") -sha256sums=('4fccef58098d099ffe955fadd5ceee78ed063ab585b8772f4242fd6dc5fd2d23') +sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9') prepare() { cd ${pkgname}-${pkgver} @@ -36,13 +40,31 @@ build() { fi mkdir build && cd build - if [[ $CARCH == "i686" ]]; then - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' - elif [[ $CARCH == "x86_64" ]]; then - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32' + if [[ $CARCH == i686 ]]; then + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_LIBRARY_PATH='/usr/lib' \ + -DPLUGIN_DIR='/usr/lib/pcsx2' \ + -DGAMEINDEX_DIR='/usr/share/pcsx2' \ + -DEXTRA_PLUGINS='TRUE' \ + -DREBUILD_SHADER='TRUE' \ + -DGLSL_API='TRUE' \ + -DPACKAGE_MODE='TRUE' \ + -DXDG_STD='TRUE' + elif [[ $CARCH == x86_64 ]]; then + cmake .. \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_TOOLCHAIN_FILE='cmake/linux-compiler-i386-multilib.cmake' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_LIBRARY_PATH='/usr/lib32' \ + -DPLUGIN_DIR='/usr/lib32/pcsx2' \ + -DGAMEINDEX_DIR='/usr/share/pcsx2' \ + -DEXTRA_PLUGINS='TRUE' \ + -DREBUILD_SHADER='TRUE' \ + -DGLSL_API='TRUE' \ + -DPACKAGE_MODE='TRUE' \ + -DXDG_STD='TRUE' fi make @@ -51,10 +73,6 @@ build() { package() { cd ${pkgname}-${pkgver}/build - if [[ $CARCH == "x86_64" ]]; then - depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') - fi - make DESTDIR="${pkgdir}" install } -- cgit v1.2.3-54-g00ecf From 53e61f91ca1f2d5f13353abfea7059a7575cace5 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 5 Feb 2015 18:45:55 -0200 Subject: update vim --- libre/vim/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD index 6abc4374e..d4f15ca69 100644 --- a/libre/vim/PKGBUILD +++ b/libre/vim/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=vim pkgname=('vim-minimal' 'vim' 'vim-python3' 'gvim' 'gvim-python3' 'vim-runtime') # list of tags can be found at https://code.google.com/p/vim/source/list _topver=7.4 -_patchlevel=580 +_patchlevel=617 _tag=v${_topver/./-}-${_patchlevel} _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -- cgit v1.2.3-54-g00ecf From 9a4296be7488240f16cd3944f96aea8d936fa276 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Fri, 6 Feb 2015 03:56:46 -0200 Subject: update linux-libre-grsec --- libre/linux-libre-grsec/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 1f2b7c79f..e9a9713cc 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -14,7 +14,7 @@ pkgbase=linux-libre-grsec # Build kernel with -grsec localname _pkgbasever=3.18-gnu _pkgver=3.18.5-gnu _grsecver=3.0 -_timestamp=201502021854 +_timestamp=201502050849 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -48,7 +48,7 @@ sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' '65a9e66cf15eb523fe6759c3eb983d93a105ea13637bc40419b7ea2143af3daf' 'SKIP' - '278ac180071745f8bb418537e13bba5d791bd6e346602c5c240bee8cdfadc778' + '35b03c3f2f2a42448a091479dc09e020fd89966570b87ec83f3b8e077b745bf4' 'SKIP' '45486e39850926a4695bd21258d0a73333c014ff38fbfcdc78cf19298a4b1feb' '5b4f43875196306cf81f864172dc6ceaf09c2d08b44809fdf11111d217e18e17' -- cgit v1.2.3-54-g00ecf