[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-12-19 Thread Felix Yan via arch-commits
Date: Saturday, December 19, 2020 @ 10:38:02
  Author: felixonmars
Revision: 779929

upgpkg: scribus 1.5.6.1-4: icu 68.2 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-19 10:32:43 UTC (rev 779928)
+++ PKGBUILD2020-12-19 10:38:02 UTC (rev 779929)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-12-02 Thread Felix Yan via arch-commits
Date: Wednesday, December 2, 2020 @ 08:20:00
  Author: felixonmars
Revision: 769107

upgpkg: scribus 1.5.6.1-3: poppler 20.12.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-02 07:52:16 UTC (rev 769106)
+++ PKGBUILD2020-12-02 08:20:00 UTC (rev 769107)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-11-15 Thread Bruno Pagani via arch-commits
Date: Sunday, November 15, 2020 @ 13:09:15
  Author: archange
Revision: 754453

Python 3.9 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-15 13:05:26 UTC (rev 754452)
+++ PKGBUILD2020-11-15 13:09:15 UTC (rev 754453)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-10-04 Thread Felix Yan via arch-commits
Date: Sunday, October 4, 2020 @ 20:59:52
  Author: felixonmars
Revision: 718562

upgpkg: scribus 1.5.5-14: poppler 20.10.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-04 20:58:48 UTC (rev 718561)
+++ PKGBUILD2020-10-04 20:59:52 UTC (rev 718562)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=13
+pkgrel=14
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-08-23 Thread Evangelos Foutras via arch-commits
Date: Sunday, August 23, 2020 @ 19:23:51
  Author: foutrelis
Revision: 687192

upgpkg: scribus 1.5.5-13: poppler 20.08.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-23 19:18:38 UTC (rev 687191)
+++ PKGBUILD2020-08-23 19:23:51 UTC (rev 687192)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=12
+pkgrel=13
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-07-03 Thread Felix Yan via arch-commits
Date: Friday, July 3, 2020 @ 10:10:47
  Author: felixonmars
Revision: 657613

upgpkg: scribus 1.5.5-12: poppler 0.90.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-03 09:58:33 UTC (rev 657612)
+++ PKGBUILD2020-07-03 10:10:47 UTC (rev 657613)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=11
+pkgrel=12
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-07-03 Thread Evangelos Foutras via arch-commits
Date: Friday, July 3, 2020 @ 09:58:33
  Author: foutrelis
Revision: 657612

Fix build with Qt 5.15

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-03 09:57:42 UTC (rev 657611)
+++ PKGBUILD2020-07-03 09:58:33 UTC (rev 657612)
@@ -19,6 +19,7 @@
 'hyphen-lang: hyphenation patterns for desired languages')
 
source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
  scribus-boost-1.71.patch
+ 
scribus-qt-5.15.patch::"https://github.com/scribusproject/scribus/commit/17d6a983.patch";
  
scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch";
  
scribus-poppler-0.83.patch::"https://github.com/scribusproject/scribus/commit/b51c2bab.patch";
  
scribus-poppler-0.84.patch::"https://github.com/scribusproject/scribus/commit/37425599.patch";
@@ -26,6 +27,7 @@
 sha256sums=('7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71'
 'SKIP'
 '19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e'
+'0378bb9f945df0368fba4372c540440e39ecab7d7e102111419b0db871283922'
 'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f'
 '5631f5a19565cdbd1290c4e1a2c5a87e56ca0af17017c191dc0c00c97a456b3b'
 '7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f8977589403694'
@@ -46,6 +48,7 @@
 mkdir -p build
 
 patch -p1 -i ../scribus-boost-1.71.patch # Fix build with boost 1.71
+patch -p1 -i ../scribus-qt-5.15.patch # Fix build with Qt 5.15
 patch -p1 -i ../scribus-poppler-0.82.patch # Fix build with poppler 0.82
 patch -p1 -i ../scribus-poppler-0.83.patch # Fix build with poppler 0.83
 patch -p1 -i ../scribus-poppler-0.84.patch # Fix build with poppler 0.84


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-05-01 Thread Evangelos Foutras via arch-commits
Date: Friday, May 1, 2020 @ 11:16:13
  Author: foutrelis
Revision: 623740

poppler 0.88.0 / cfitsio 3.48 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-01 11:10:48 UTC (rev 623739)
+++ PKGBUILD2020-05-01 11:16:13 UTC (rev 623740)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=10
+pkgrel=11
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-04-27 Thread Evangelos Foutras via arch-commits
Date: Monday, April 27, 2020 @ 12:38:45
  Author: foutrelis
Revision: 621876

icu 67.1 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-27 12:33:32 UTC (rev 621875)
+++ PKGBUILD2020-04-27 12:38:45 UTC (rev 621876)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=9
+pkgrel=10
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-03-30 Thread Felix Yan via arch-commits
Date: Monday, March 30, 2020 @ 10:54:14
  Author: felixonmars
Revision: 606740

poppler 0.87.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-30 10:44:50 UTC (rev 606739)
+++ PKGBUILD2020-03-30 10:54:14 UTC (rev 606740)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=8
+pkgrel=9
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-03-19 Thread Sven-Hendrik Haase via arch-commits
Date: Thursday, March 19, 2020 @ 17:49:18
  Author: svenstaro
Revision: 600991

upgpkg: scribus 1.5.5-8

openscenegraph 3.6.5 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-19 17:43:12 UTC (rev 600990)
+++ PKGBUILD2020-03-19 17:49:18 UTC (rev 600991)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=7
+pkgrel=8
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-03-03 Thread Felix Yan via arch-commits
Date: Tuesday, March 3, 2020 @ 20:46:55
  Author: felixonmars
Revision: 589842

poppler 0.86.1 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-03 20:39:04 UTC (rev 589841)
+++ PKGBUILD2020-03-03 20:46:55 UTC (rev 589842)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=6
+pkgrel=7
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD scribus-poppler-0.86.patch)

2020-03-03 Thread Antonio Rojas via arch-commits
Date: Tuesday, March 3, 2020 @ 20:39:04
  Author: arojas
Revision: 589841

Fix build with poppler 0.86

Added:
  scribus/trunk/scribus-poppler-0.86.patch
Modified:
  scribus/trunk/PKGBUILD

+
 PKGBUILD   |7 +
 scribus-poppler-0.86.patch |  186 +++
 2 files changed, 191 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-03 20:36:18 UTC (rev 589840)
+++ PKGBUILD2020-03-03 20:39:04 UTC (rev 589841)
@@ -21,13 +21,15 @@
  scribus-boost-1.71.patch
  
scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch";
  
scribus-poppler-0.83.patch::"https://github.com/scribusproject/scribus/commit/b51c2bab.patch";
- 
scribus-poppler-0.84.patch::"https://github.com/scribusproject/scribus/commit/37425599.patch";)
+ 
scribus-poppler-0.84.patch::"https://github.com/scribusproject/scribus/commit/37425599.patch";
+ scribus-poppler-0.86.patch)
 sha256sums=('7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71'
 'SKIP'
 '19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e'
 'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f'
 '5631f5a19565cdbd1290c4e1a2c5a87e56ca0af17017c191dc0c00c97a456b3b'
-'7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f8977589403694')
+'7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f8977589403694'
+'ac660067894effdde20e92c2f32095336707a7f6f3f277316498999096f65445')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell 

   757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team 
(www.scribus.net) 
   6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney 

@@ -47,6 +49,7 @@
 patch -p1 -i ../scribus-poppler-0.82.patch # Fix build with poppler 0.82
 patch -p1 -i ../scribus-poppler-0.83.patch # Fix build with poppler 0.83
 patch -p1 -i ../scribus-poppler-0.84.patch # Fix build with poppler 0.84
+patch -p1 -i ../scribus-poppler-0.86.patch # Fix build with poppler 0.86
 }
 
 build() {

Added: scribus-poppler-0.86.patch
===
--- scribus-poppler-0.86.patch  (rev 0)
+++ scribus-poppler-0.86.patch  2020-03-03 20:39:04 UTC (rev 589841)
@@ -0,0 +1,186 @@
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp 
b/scribus/plugins/import/pdf/importpdf.cpp
+index 427cd66ef..7fe18d86b 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
 b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -792,13 +792,13 @@ bool PdfPlug::convert(const QString& fn)
+   if 
(names.isDict())
+   {
+   
LinkAction *linkAction = nullptr;
+-  
linkAction = LinkAction::parseAction(&names, 
pdfDoc->getCatalog()->getBaseURI());
++  
linkAction = LinkAction::parseAction(&names, 
pdfDoc->getCatalog()->getBaseURI()).get();
+   if 
(linkAction)
+   {
+   
LinkJavaScript *jsa = (LinkJavaScript*)linkAction;
+   
if (jsa->isOk())
+   
{
+-  
QString script = UnicodeParsedString(jsa->getScript());
++  
QString script = QString::fromStdString(jsa->getScript());
+   
if (script.startsWith("this."))
+   
{
+   
script.remove(0, 5);
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp 
b/scribus/plugins/import/pdf/slaoutput.cpp
+index 93ceb1e30..d14dfa1d9 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
 b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -289,7 +289,7 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const 
char *key, AnnotWidget *a
+   {
+   Object actionObject = 
additionalActionsObject.dictLookup(key);
+   if (actionObject.isDict())
+-  

[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-01-30 Thread Evangelos Foutras via arch-commits
Date: Thursday, January 30, 2020 @ 16:58:02
  Author: foutrelis
Revision: 560118

poppler 0.85.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-30 16:53:48 UTC (rev 560117)
+++ PKGBUILD2020-01-30 16:58:02 UTC (rev 560118)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=5
+pkgrel=6
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-01-07 Thread Felix Yan via arch-commits
Date: Tuesday, January 7, 2020 @ 21:42:10
  Author: felixonmars
Revision: 550112

poppler 0.84.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-07 21:41:39 UTC (rev 550111)
+++ PKGBUILD2020-01-07 21:42:10 UTC (rev 550112)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-01-07 Thread Antonio Rojas via arch-commits
Date: Tuesday, January 7, 2020 @ 21:34:59
  Author: arojas
Revision: 550104

Fix build with poppler 0.84

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-07 21:33:36 UTC (rev 550103)
+++ PKGBUILD2020-01-07 21:34:59 UTC (rev 550104)
@@ -20,12 +20,14 @@
 
source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
  scribus-boost-1.71.patch
  
scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch";
- 
scribus-poppler-0.83.patch::"https://github.com/scribusproject/scribus/commit/b51c2bab.patch";)
+ 
scribus-poppler-0.83.patch::"https://github.com/scribusproject/scribus/commit/b51c2bab.patch";
+ 
scribus-poppler-0.84.patch::"https://github.com/scribusproject/scribus/commit/37425599.patch";)
 sha256sums=('7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71'
 'SKIP'
 '19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e'
 'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f'
-'5631f5a19565cdbd1290c4e1a2c5a87e56ca0af17017c191dc0c00c97a456b3b')
+'5631f5a19565cdbd1290c4e1a2c5a87e56ca0af17017c191dc0c00c97a456b3b'
+'7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f8977589403694')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell 

   757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team 
(www.scribus.net) 
   6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney 

@@ -44,6 +46,7 @@
 patch -p1 -i ../scribus-boost-1.71.patch # Fix build with boost 1.71
 patch -p1 -i ../scribus-poppler-0.82.patch # Fix build with poppler 0.82
 patch -p1 -i ../scribus-poppler-0.83.patch # Fix build with poppler 0.83
+patch -p1 -i ../scribus-poppler-0.84.patch # Fix build with poppler 0.84
 }
 
 build() {


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2020-01-07 Thread Antonio Rojas via arch-commits
Date: Tuesday, January 7, 2020 @ 21:09:22
  Author: arojas
Revision: 550095

Fix build with poppler 0.83

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-07 20:49:51 UTC (rev 550094)
+++ PKGBUILD2020-01-07 21:09:22 UTC (rev 550095)
@@ -19,11 +19,13 @@
 'hyphen-lang: hyphenation patterns for desired languages')
 
source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
  scribus-boost-1.71.patch
- 
scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch";)
+ 
scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch";
+ 
scribus-poppler-0.83.patch::"https://github.com/scribusproject/scribus/commit/b51c2bab.patch";)
 sha256sums=('7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71'
 'SKIP'
 '19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e'
-'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f')
+'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f'
+'5631f5a19565cdbd1290c4e1a2c5a87e56ca0af17017c191dc0c00c97a456b3b')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell 

   757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team 
(www.scribus.net) 
   6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney 

@@ -41,6 +43,7 @@
 
 patch -p1 -i ../scribus-boost-1.71.patch # Fix build with boost 1.71
 patch -p1 -i ../scribus-poppler-0.82.patch # Fix build with poppler 0.82
+patch -p1 -i ../scribus-poppler-0.83.patch # Fix build with poppler 0.83
 }
 
 build() {


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-11-12 Thread Felix Yan via arch-commits
Date: Tuesday, November 12, 2019 @ 09:26:21
  Author: felixonmars
Revision: 526963

icu 65.1 / poppler 0.82.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-12 09:07:58 UTC (rev 526962)
+++ PKGBUILD2019-11-12 09:26:21 UTC (rev 526963)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD scribus-boost-1.71.patch)

2019-11-12 Thread Antonio Rojas via arch-commits
Date: Tuesday, November 12, 2019 @ 09:03:59
  Author: arojas
Revision: 526960

Fix build with boost 1.71 and poppler 0.82

Added:
  scribus/trunk/scribus-boost-1.71.patch
Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 scribus-boost-1.71.patch |   12 
 2 files changed, 22 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-12 08:34:17 UTC (rev 526959)
+++ PKGBUILD2019-11-12 09:03:59 UTC (rev 526960)
@@ -17,8 +17,13 @@
 makedepends=(cmake boost mesa qt5-tools)
 optdepends=('tk: scripts based on tkinter'
 'hyphen-lang: hyphenation patterns for desired languages')
-source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc})
-sha256sums=(7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71 
SKIP)
+source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
+ scribus-boost-1.71.patch
+ 
scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch";)
+sha256sums=('7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71'
+'SKIP'
+'19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e'
+'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell 

   757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team 
(www.scribus.net) 
   6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney 

@@ -33,6 +38,9 @@
 -i scribus/plugins/scriptplugin/{samples,scripts}/*
 
 mkdir -p build
+
+patch -p1 -i ../scribus-boost-1.71.patch # Fix build with boost 1.71
+patch -p1 -i ../scribus-poppler-0.82.patch # Fix build with poppler 0.82
 }
 
 build() {

Added: scribus-boost-1.71.patch
===
--- scribus-boost-1.71.patch(rev 0)
+++ scribus-boost-1.71.patch2019-11-12 09:03:59 UTC (rev 526960)
@@ -0,0 +1,12 @@
+diff --git a/scribus/plugins/tools/2geomtools/CMakeLists.txt 
b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+index 9b6683cbb..d2e1ee5ea 100644
+--- a/scribus/plugins/tools/2geomtools/CMakeLists.txt
 b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+@@ -3,6 +3,6 @@ include_directories(
+   ${CMAKE_SOURCE_DIR}/scribus
+ )
+ 
+-include_directories( ${Boost_INCLUDE_DIR} )
++include_directories( ${Boost_INCLUDE_DIRS} )
+ add_subdirectory (meshdistortion)
+ add_subdirectory (pathalongpath)


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-08-23 Thread Evangelos Foutras via arch-commits
Date: Friday, August 23, 2019 @ 08:23:51
  Author: foutrelis
Revision: 501235

poppler 0.80 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-23 07:51:47 UTC (rev 501234)
+++ PKGBUILD2019-08-23 08:23:51 UTC (rev 501235)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-08-07 Thread Levente Polyak via arch-commits
Date: Wednesday, August 7, 2019 @ 22:34:23
  Author: anthraxx
Revision: 498308

upgpkg: scribus 1.5.5-2 (openscenegraph rebuild)

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-07 22:24:23 UTC (rev 498307)
+++ PKGBUILD2019-08-07 22:34:23 UTC (rev 498308)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-06-30 Thread Felix Yan via arch-commits
Date: Sunday, June 30, 2019 @ 10:03:20
  Author: felixonmars
Revision: 486222

poppler 0.78 / nettle 3.5 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-30 10:02:55 UTC (rev 486221)
+++ PKGBUILD2019-06-30 10:03:20 UTC (rev 486222)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=12
+pkgrel=13
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-04-23 Thread Felix Yan via arch-commits
Date: Tuesday, April 23, 2019 @ 21:03:02
  Author: felixonmars
Revision: 453242

poppler 0.76.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-23 21:00:10 UTC (rev 453241)
+++ PKGBUILD2019-04-23 21:03:02 UTC (rev 453242)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=11
+pkgrel=12
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD scribus-poppler-0.76.patch)

2019-04-23 Thread Antonio Rojas via arch-commits
Date: Tuesday, April 23, 2019 @ 20:51:20
  Author: arojas
Revision: 453239

Fix build with poppler 0.76

Added:
  scribus/trunk/scribus-poppler-0.76.patch
Modified:
  scribus/trunk/PKGBUILD

+
 PKGBUILD   |8 ++--
 scribus-poppler-0.76.patch |   40 
 2 files changed, 46 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-23 20:42:08 UTC (rev 453238)
+++ PKGBUILD2019-04-23 20:51:20 UTC (rev 453239)
@@ -24,7 +24,8 @@
 
'https://github.com/scribusproject/scribus/commit/8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch'
 'scribus-poppler-0.70.patch'
 'scribus-poppler-0.73.patch'
-'scribus-poppler-0.75.patch')
+'scribus-poppler-0.75.patch'
+'scribus-poppler-0.76.patch')
 sha256sums=('6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03'
 'SKIP'
 '0a782958360ad70145a588a5e1c0044d162344e96b4ff9b0aeb31388cc9b2e36'
@@ -33,7 +34,8 @@
 '824cbc38b02e15aa742b309a226549c3a6c4e3eb16059c239083145aa4ae6dab'
 '199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737'
 'f09488ff56177fd360d588bf70f2960adeba80cb34cec692d4d967dc081fe4ad'
-'0e69817dc9b047852540dd76aaec39b54a4781c273e4d5fe2764c773b3160ed2')
+'0e69817dc9b047852540dd76aaec39b54a4781c273e4d5fe2764c773b3160ed2'
+'115ec3b46e303f648ecf55769ab5c6cfeefcf914822164ec187a0bcb22699305')
 validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA'  # Peter Linnell 

   '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team 
(www.scribus.net) 
 
@@ -55,6 +57,8 @@
 patch -p0 -i ../scribus-poppler-0.73.patch
 # Poppler 0.75
 patch -p1 --binary -i ../scribus-poppler-0.75.patch
+# Poppler 0.76
+patch -p1 -i ../scribus-poppler-0.76.patch
 # Fix python name
 sed \
 -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \

Added: scribus-poppler-0.76.patch
===
--- scribus-poppler-0.76.patch  (rev 0)
+++ scribus-poppler-0.76.patch  2019-04-23 20:51:20 UTC (rev 453239)
@@ -0,0 +1,40 @@
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp 
b/scribus/plugins/import/pdf/slaoutput.cpp
+index fe9794a65..2012d98d3 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
 b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -430,7 +430,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double 
xCoor, double yCoor, do
+   if (dst->isPageRef())
+   {
+   Ref dstr = dst->getPageRef();
+-  pagNum = pdfDoc->findPage(dstr.num, 
dstr.gen);
++  pagNum = pdfDoc->findPage(dstr);
+   }
+   else
+   pagNum = dst->getPageNum();
+@@ -452,7 +452,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double 
xCoor, double yCoor, do
+   if (dstn->isPageRef())
+   {
+   Ref dstr = 
dstn->getPageRef();
+-  pagNum = 
pdfDoc->findPage(dstr.num, dstr.gen);
++  pagNum = 
pdfDoc->findPage(dstr);
+   }
+   else
+   pagNum = 
dstn->getPageNum();
+@@ -932,7 +932,7 @@ void SlaOutputDev::handleActions(PageItem* ite, 
AnnotWidget *ano)
+   if (dst->isPageRef())
+   {
+   Ref dstr = dst->getPageRef();
+-  pagNum = 
pdfDoc->findPage(dstr.num, dstr.gen);
++  pagNum = pdfDoc->findPage(dstr);
+   }
+   else
+   pagNum = dst->getPageNum();
+@@ -956,7 +956,7 @@ void SlaOutputDev::handleActions(PageItem* ite, 
AnnotWidget *ano)
+   if (dstn->isPageRef())
+   {
+   Ref dstr = 
dstn->getPageRef();
+-  pagNum = 
pdfDoc->findPage(dstr.num, dstr.gen);
++  pagNum = 
pdfDoc->findPage(dstr);
+

[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-04-05 Thread Evangelos Foutras via arch-commits
Date: Friday, April 5, 2019 @ 14:57:02
  Author: foutrelis
Revision: 449845

icu 64.1 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-05 14:56:44 UTC (rev 449844)
+++ PKGBUILD2019-04-05 14:57:02 UTC (rev 449845)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=10
+pkgrel=11
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-03-22 Thread Felix Yan via arch-commits
Date: Friday, March 22, 2019 @ 10:39:27
  Author: felixonmars
Revision: 443137

poppler 0.75.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-22 10:31:52 UTC (rev 443136)
+++ PKGBUILD2019-03-22 10:39:27 UTC (rev 443137)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=9
+pkgrel=10
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-03-22 Thread Antonio Rojas via arch-commits
Date: Friday, March 22, 2019 @ 10:31:52
  Author: arojas
Revision: 443136

Fix checksums

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-22 10:29:14 UTC (rev 443135)
+++ PKGBUILD2019-03-22 10:31:52 UTC (rev 443136)
@@ -32,7 +32,8 @@
 '29b09c7cc95e8a5432010b39a6c0478cb106a1bbb425747fb383092465476106'
 '824cbc38b02e15aa742b309a226549c3a6c4e3eb16059c239083145aa4ae6dab'
 '199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737'
-'f09488ff56177fd360d588bf70f2960adeba80cb34cec692d4d967dc081fe4ad')
+'f09488ff56177fd360d588bf70f2960adeba80cb34cec692d4d967dc081fe4ad'
+'0e69817dc9b047852540dd76aaec39b54a4781c273e4d5fe2764c773b3160ed2')
 validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA'  # Peter Linnell 

   '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team 
(www.scribus.net) 
 


[arch-commits] Commit in scribus/trunk (PKGBUILD scribus-poppler-0.75.patch)

2019-03-22 Thread Antonio Rojas via arch-commits
Date: Friday, March 22, 2019 @ 10:29:14
  Author: arojas
Revision: 443135

Fix build with poppler 0.75

Added:
  scribus/trunk/scribus-poppler-0.75.patch
Modified:
  scribus/trunk/PKGBUILD

+
 PKGBUILD   |5 -
 scribus-poppler-0.75.patch |   40 
 2 files changed, 44 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-22 10:11:17 UTC (rev 443134)
+++ PKGBUILD2019-03-22 10:29:14 UTC (rev 443135)
@@ -23,7 +23,8 @@
 
'https://github.com/scribusproject/scribus/commit/76561c1a55cd07c268f8f2b2fea888532933700b.patch'
 
'https://github.com/scribusproject/scribus/commit/8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch'
 'scribus-poppler-0.70.patch'
-'scribus-poppler-0.73.patch')
+'scribus-poppler-0.73.patch'
+'scribus-poppler-0.75.patch')
 sha256sums=('6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03'
 'SKIP'
 '0a782958360ad70145a588a5e1c0044d162344e96b4ff9b0aeb31388cc9b2e36'
@@ -51,6 +52,8 @@
 sed -e 's|getCString|c_str|g' -i scribus/plugins/import/pdf/*
 # Poppler 0.73
 patch -p0 -i ../scribus-poppler-0.73.patch
+# Poppler 0.75
+patch -p1 --binary -i ../scribus-poppler-0.75.patch
 # Fix python name
 sed \
 -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \

Added: scribus-poppler-0.75.patch
===
--- scribus-poppler-0.75.patch  (rev 0)
+++ scribus-poppler-0.75.patch  2019-03-22 10:29:14 UTC (rev 443135)
@@ -0,0 +1,40 @@
+--- scribus-1.5.4/scribus/plugins/import/pdf/importpdf.cpp.orig
2019-03-22 09:47:14.760191871 +
 scribus-1.5.4/scribus/plugins/import/pdf/importpdf.cpp 2019-03-22 
09:47:37.363809447 +
+@@ -535,7 +535,7 @@
+   if 
(orderItem.isDict())
+   {
+ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
+-  
Object ref = order->getNF(i);   
++  
Object ref = order->getNF(i).copy();
+ #else
+   
Object ref;
+   
order->getNF(i, &ref);
+--- scribus-1.5.4/scribus/plugins/import/pdf/slaoutput.cpp.orig
2019-03-22 10:02:43.145371895 +
 scribus-1.5.4/scribus/plugins/import/pdf/slaoutput.cpp 2019-03-22 
10:07:03.085386627 +
+@@ -310,7 +310,7 @@
+   if (obj.isDict())
+   {
+   Dict* adic = obj.getDict();
+-  additionalActions = adic->lookupNF("A");
++  additionalActions = adic->lookupNF("A").copy();
+   Object additionalActionsObject = 
additionalActions.fetch(pdfDoc->getXRef());
+   if (additionalActionsObject.isDict())
+   {
+@@ -370,7 +370,7 @@
+   if (obj.isDict())
+   {
+   Dict* adic = obj.getDict();
+-  additionalActions = adic->lookupNF("AA");
++  additionalActions = adic->lookupNF("AA").copy();
+   Object additionalActionsObject = 
additionalActions.fetch(pdfDoc->getXRef());
+   if (additionalActionsObject.isDict())
+   {
+@@ -939,7 +939,7 @@
+   QList radList;
+   for (int i = 0; i < obj2.arrayGetLength(); i++)
+   {
+-  Object childRef = obj2.arrayGetNF(i);
++  Object childRef = 
obj2.arrayGetNF(i).copy();
+   if (!childRef.isRef())
+   continue;
+   Object childObj = obj2.arrayGet(i);


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-02-08 Thread Evangelos Foutras via arch-commits
Date: Friday, February 8, 2019 @ 22:23:59
  Author: foutrelis
Revision: 430750

poppler 0.74.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-08 22:21:20 UTC (rev 430749)
+++ PKGBUILD2019-02-08 22:23:59 UTC (rev 430750)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=8
+pkgrel=9
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2019-01-19 Thread Evangelos Foutras via arch-commits
Date: Saturday, January 19, 2019 @ 12:16:29
  Author: foutrelis
Revision: 424578

poppler 0.73.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-19 12:14:37 UTC (rev 424577)
+++ PKGBUILD2019-01-19 12:16:29 UTC (rev 424578)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=7
+pkgrel=8
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD scribus-poppler-0.73.patch)

2019-01-19 Thread Evangelos Foutras via arch-commits
Date: Saturday, January 19, 2019 @ 12:05:03
  Author: foutrelis
Revision: 424561

Follow-up fix for poppler 0.73

Modified:
  scribus/trunk/PKGBUILD
  scribus/trunk/scribus-poppler-0.73.patch

+
 PKGBUILD   |2 +-
 scribus-poppler-0.73.patch |   16 
 2 files changed, 17 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-19 12:04:00 UTC (rev 424560)
+++ PKGBUILD2019-01-19 12:05:03 UTC (rev 424561)
@@ -31,7 +31,7 @@
 '29b09c7cc95e8a5432010b39a6c0478cb106a1bbb425747fb383092465476106'
 '824cbc38b02e15aa742b309a226549c3a6c4e3eb16059c239083145aa4ae6dab'
 '199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737'
-'d998054d117671cbc392ec594ab1a21f8e32b02680429ffa05300cb420d80934')
+'f09488ff56177fd360d588bf70f2960adeba80cb34cec692d4d967dc081fe4ad')
 validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA'  # Peter Linnell 

   '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team 
(www.scribus.net) 
 

Modified: scribus-poppler-0.73.patch
===
--- scribus-poppler-0.73.patch  2019-01-19 12:04:00 UTC (rev 424560)
+++ scribus-poppler-0.73.patch  2019-01-19 12:05:03 UTC (rev 424561)
@@ -1,3 +1,19 @@
+Index: scribus/plugins/import/pdf/importpdfconfig.h
+===
+--- scribus/plugins/import/pdf/importpdfconfig.h   (revision 22797)
 scribus/plugins/import/pdf/importpdfconfig.h   (revision 22798)
+@@ -37,4 +37,11 @@
+ #define getCString  c_str
+ #endif
+ 
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 73, 0)
++#define Guchar  unsigned char
++#define Gushort unsigned short
++#define Guint   unsigned int
++#define Gulong  unsigned long
+ #endif
++
++#endif
 Index: scribus/plugins/import/pdf/slaoutput.h
 ===
 --- scribus/plugins/import/pdf/slaoutput.h (revision 22805)


[arch-commits] Commit in scribus/trunk (PKGBUILD scribus-poppler-0.73.patch)

2019-01-19 Thread Evangelos Foutras via arch-commits
Date: Saturday, January 19, 2019 @ 11:50:30
  Author: foutrelis
Revision: 424538

Fix build with poppler 0.73

Added:
  scribus/trunk/scribus-poppler-0.73.patch
Modified:
  scribus/trunk/PKGBUILD

+
 PKGBUILD   |8 ++--
 scribus-poppler-0.73.patch |   14 ++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-19 11:50:02 UTC (rev 424537)
+++ PKGBUILD2019-01-19 11:50:30 UTC (rev 424538)
@@ -22,7 +22,8 @@
 
'https://github.com/scribusproject/scribus/commit/7d4ceeb5cac32287769e3c0238699e0b3e56c24d.patch'
 
'https://github.com/scribusproject/scribus/commit/76561c1a55cd07c268f8f2b2fea888532933700b.patch'
 
'https://github.com/scribusproject/scribus/commit/8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch'
-'scribus-poppler-0.70.patch')
+'scribus-poppler-0.70.patch'
+'scribus-poppler-0.73.patch')
 sha256sums=('6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03'
 'SKIP'
 '0a782958360ad70145a588a5e1c0044d162344e96b4ff9b0aeb31388cc9b2e36'
@@ -29,7 +30,8 @@
 'b20bf0588b30d551ea6eb5744caf31ef31dd396b2b08cc4bddf9dd3a22cf'
 '29b09c7cc95e8a5432010b39a6c0478cb106a1bbb425747fb383092465476106'
 '824cbc38b02e15aa742b309a226549c3a6c4e3eb16059c239083145aa4ae6dab'
-'199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737')
+'199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737'
+'d998054d117671cbc392ec594ab1a21f8e32b02680429ffa05300cb420d80934')
 validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA'  # Peter Linnell 

   '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team 
(www.scribus.net) 
 
@@ -47,6 +49,8 @@
 sed -e 's|GBool|bool|g' -e 's|gTrue|true|g' -e 's|gFalse|false|g' -i 
scribus/plugins/import/pdf/*
 # Poppler 0.72
 sed -e 's|getCString|c_str|g' -i scribus/plugins/import/pdf/*
+# Poppler 0.73
+patch -p0 -i ../scribus-poppler-0.73.patch
 # Fix python name
 sed \
 -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \

Added: scribus-poppler-0.73.patch
===
--- scribus-poppler-0.73.patch  (rev 0)
+++ scribus-poppler-0.73.patch  2019-01-19 11:50:30 UTC (rev 424538)
@@ -0,0 +1,14 @@
+Index: scribus/plugins/import/pdf/slaoutput.h
+===
+--- scribus/plugins/import/pdf/slaoutput.h (revision 22805)
 scribus/plugins/import/pdf/slaoutput.h (revision 22806)
+@@ -28,7 +28,9 @@
+ #include "selection.h"
+ #include "vgradient.h"
+ 
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0)
+ #include 
++#endif
+ #include 
+ #include 
+ #include 


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2018-12-14 Thread Felix Yan via arch-commits
Date: Friday, December 14, 2018 @ 20:06:32
  Author: felixonmars
Revision: 416286

poppler 0.72.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-14 19:58:10 UTC (rev 416285)
+++ PKGBUILD2018-12-14 20:06:32 UTC (rev 416286)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=6
+pkgrel=7
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2018-12-14 Thread Antonio Rojas via arch-commits
Date: Friday, December 14, 2018 @ 19:54:34
  Author: arojas
Revision: 416284

Fix build with poppler 0.72

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-14 18:27:38 UTC (rev 416283)
+++ PKGBUILD2018-12-14 19:54:34 UTC (rev 416284)
@@ -45,7 +45,8 @@
 patch -p1 -i ../scribus-poppler-0.70.patch
 # Poppler 0.71
 sed -e 's|GBool|bool|g' -e 's|gTrue|true|g' -e 's|gFalse|false|g' -i 
scribus/plugins/import/pdf/*
-
+# Poppler 0.72
+sed -e 's|getCString|c_str|g' -i scribus/plugins/import/pdf/*
 # Fix python name
 sed \
 -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2018-11-17 Thread Evangelos Foutras via arch-commits
Date: Saturday, November 17, 2018 @ 17:40:28
  Author: foutrelis
Revision: 408592

hunspell 1.7.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-17 17:34:45 UTC (rev 408591)
+++ PKGBUILD2018-11-17 17:40:28 UTC (rev 408592)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=5
+pkgrel=6
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2018-11-01 Thread Felix Yan via arch-commits
Date: Thursday, November 1, 2018 @ 17:50:48
  Author: felixonmars
Revision: 401136

poppler 0.71.0 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-01 17:45:31 UTC (rev 401135)
+++ PKGBUILD2018-11-01 17:50:48 UTC (rev 401136)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2018-11-01 Thread Antonio Rojas via arch-commits
Date: Thursday, November 1, 2018 @ 17:45:31
  Author: arojas
Revision: 401135

Fix build with poppler 0.71

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 ++
 1 file changed, 2 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-01 17:42:17 UTC (rev 401134)
+++ PKGBUILD2018-11-01 17:45:31 UTC (rev 401135)
@@ -43,6 +43,8 @@
 # Poppler 0.70
 patch -p1 -i ../8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch
 patch -p1 -i ../scribus-poppler-0.70.patch
+# Poppler 0.71
+sed -e 's|GBool|bool|g' -e 's|gTrue|true|g' -e 's|gFalse|false|g' -i 
scribus/plugins/import/pdf/*
 
 # Fix python name
 sed \


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2018-10-02 Thread Bruno Pagani via arch-commits
Date: Tuesday, October 2, 2018 @ 15:35:47
  Author: archange
Revision: 389014

openscenegraph 3.6.3 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-02 15:24:14 UTC (rev 389013)
+++ PKGBUILD2018-10-02 15:35:47 UTC (rev 389014)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2018-09-07 Thread Jelle van der Waa via arch-commits
Date: Friday, September 7, 2018 @ 22:51:06
  Author: jelle
Revision: 378713

upgpkg: scribus 1.5.4-2

podofo rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-07 22:05:18 UTC (rev 378712)
+++ PKGBUILD2018-09-07 22:51:06 UTC (rev 378713)
@@ -8,7 +8,7 @@
 
 pkgname=scribus
 pkgver=1.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop publishing software"
 arch=('x86_64')
 url="https://www.scribus.net/";


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2018-04-28 Thread Gaëtan Bisson via arch-commits
Date: Saturday, April 28, 2018 @ 21:12:20
  Author: bisson
Revision: 318410

upstream update

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-28 19:18:48 UTC (rev 318409)
+++ PKGBUILD2018-04-28 21:12:20 UTC (rev 318410)
@@ -6,8 +6,8 @@
 # Contributor: Ben 
 
 pkgname=scribus
-pkgver=1.4.6
-pkgrel=4
+pkgver=1.4.7
+pkgrel=1
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
@@ -19,7 +19,7 @@
  'desktop-file-utils' 'shared-mime-info')
 validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA')
 
source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc})
-sha256sums=('21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a'
+sha256sums=('42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec'
 'SKIP')
 
 prepare() {


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2017-03-01 Thread Gaëtan Bisson
Date: Thursday, March 2, 2017 @ 01:00:18
  Author: bisson
Revision: 214406

switch to sha256sum

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 01:00:14 UTC (rev 214405)
+++ PKGBUILD2017-03-02 01:00:18 UTC (rev 214406)
@@ -18,8 +18,9 @@
  'ghostscript' 'python2' 'podofo' 'boost-libs'
  'desktop-file-utils' 'shared-mime-info')
 validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc})
-sha1sums=('f04a2eecfb531af4beb99645f85165be161b00a3' 'SKIP')
+source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc})
+sha256sums=('21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a'
+'SKIP')
 
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2017-02-03 Thread Antonio Rojas
Date: Friday, February 3, 2017 @ 18:49:28
  Author: arojas
Revision: 209783

podofo 0.9.5 rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-03 18:34:07 UTC (rev 209782)
+++ PKGBUILD2017-02-03 18:49:28 UTC (rev 209783)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.6
-pkgrel=3
+pkgrel=4
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2016-07-06 Thread Gaëtan Bisson
Date: Wednesday, July 6, 2016 @ 07:52:38
  Author: bisson
Revision: 182385

rebuild for podofo-0.9.4

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-06 07:25:54 UTC (rev 182384)
+++ PKGBUILD2016-07-06 07:52:38 UTC (rev 182385)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')


[arch-commits] Commit in scribus/trunk (PKGBUILD install)

2016-05-05 Thread Gaetan Bisson
Date: Thursday, May 5, 2016 @ 11:44:28
  Author: bisson
Revision: 173822

remove deprecated install file

Modified:
  scribus/trunk/PKGBUILD
Deleted:
  scribus/trunk/install

--+
 PKGBUILD |4 +---
 install  |   11 ---
 2 files changed, 1 insertion(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-05 09:43:03 UTC (rev 173821)
+++ PKGBUILD2016-05-05 09:44:28 UTC (rev 173822)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
@@ -21,8 +21,6 @@
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc})
 sha1sums=('f04a2eecfb531af4beb99645f85165be161b00a3' 'SKIP')
 
-install=install
-
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed \

Deleted: install
===
--- install 2016-05-05 09:43:03 UTC (rev 173821)
+++ install 2016-05-05 09:44:28 UTC (rev 173822)
@@ -1,11 +0,0 @@
-post_install() {
-   update-mime-database usr/share/mime &> /dev/null
-   update-desktop-database -q
-}
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   post_install
-}


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2016-01-13 Thread Gaetan Bisson
Date: Wednesday, January 13, 2016 @ 09:32:12
  Author: bisson
Revision: 156297

upstream update

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-13 08:03:09 UTC (rev 156296)
+++ PKGBUILD2016-01-13 08:32:12 UTC (rev 156297)
@@ -6,8 +6,8 @@
 # Contributor: Ben 
 
 pkgname=scribus
-pkgver=1.4.5
-pkgrel=4
+pkgver=1.4.6
+pkgrel=1
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
@@ -17,8 +17,9 @@
 depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
  'ghostscript' 'python2' 'podofo' 'boost-libs'
  'desktop-file-utils' 'shared-mime-info')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
-sha1sums=('70685aeb66d1f8f4984125c56f8f6e059af267c3')
+validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc})
+sha1sums=('f04a2eecfb531af4beb99645f85165be161b00a3' 'SKIP')
 
 install=install
 


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2015-12-06 Thread Bartłomiej Piotrowski
Date: Monday, December 7, 2015 @ 07:12:57
  Author: bpiotrowski
Revision: 149639

C++11 ABI rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 06:12:28 UTC (rev 149638)
+++ PKGBUILD2015-12-07 06:12:57 UTC (rev 149639)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.5
-pkgrel=3
+pkgrel=4
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2015-10-08 Thread Gaetan Bisson
Date: Friday, October 9, 2015 @ 06:05:12
  Author: bisson
Revision: 143472

refix FS#46593

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-09 03:38:48 UTC (rev 143471)
+++ PKGBUILD2015-10-09 04:05:12 UTC (rev 143472)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
@@ -45,5 +45,5 @@
cd "${srcdir}/${pkgname}-${pkgver}/build"
make DESTDIR="${pkgdir}" install
install -Dm644 ../scribus.desktop 
"${pkgdir}/usr/share/applications/scribus.desktop"
-   install -Dm644 ../resources/icons/AppIcon.png 
"${pkgdir}/usr/share/icons/hicolor/32x32/scribus.png"
+   install -Dm644 ../resources/icons/AppIcon.png 
"${pkgdir}/usr/share/icons/hicolor/32x32/apps/scribus.png"
 }


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2015-10-07 Thread Gaetan Bisson
Date: Wednesday, October 7, 2015 @ 21:49:40
  Author: bisson
Revision: 143314

fix FS#46593

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-07 18:31:17 UTC (rev 143313)
+++ PKGBUILD2015-10-07 19:49:40 UTC (rev 143314)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
@@ -24,17 +24,16 @@
 
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i 
scribus.desktop
sed \
-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-i scribus/plugins/scriptplugin/{samples,scripts}/*
-   install -d ../build
+   install -d build
 }
 
 build() {
-   cd "${srcdir}/build"
-   cmake "../${pkgname}-${pkgver}" \
+   cd "${srcdir}/${pkgname}-${pkgver}/build"
+   cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
@@ -43,7 +42,8 @@
 }
 
 package() {
-   cd "${srcdir}/build"
+   cd "${srcdir}/${pkgname}-${pkgver}/build"
make DESTDIR="${pkgdir}" install
-   install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" 
"${pkgdir}/usr/share/applications/scribus.desktop"
+   install -Dm644 ../scribus.desktop 
"${pkgdir}/usr/share/applications/scribus.desktop"
+   install -Dm644 ../resources/icons/AppIcon.png 
"${pkgdir}/usr/share/icons/hicolor/32x32/scribus.png"
 }


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2015-05-31 Thread Gaetan Bisson
Date: Sunday, May 31, 2015 @ 23:34:34
  Author: bisson
Revision: 134431

xz tarball disappeared...

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-31 21:23:07 UTC (rev 134430)
+++ PKGBUILD2015-05-31 21:34:34 UTC (rev 134431)
@@ -17,7 +17,7 @@
 depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
  'ghostscript' 'python2' 'podofo' 'boost-libs'
  'desktop-file-utils' 'shared-mime-info')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
 sha1sums=('70685aeb66d1f8f4984125c56f8f6e059af267c3')
 
 install=install


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2015-01-30 Thread Gaetan Bisson
Date: Saturday, January 31, 2015 @ 08:37:21
  Author: bisson
Revision: 126836

upstream update

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-31 06:23:28 UTC (rev 126835)
+++ PKGBUILD2015-01-31 07:37:21 UTC (rev 126836)
@@ -6,8 +6,8 @@
 # Contributor: Ben 
 
 pkgname=scribus
-pkgver=1.4.4
-pkgrel=2
+pkgver=1.4.5
+pkgrel=1
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
@@ -18,7 +18,7 @@
  'ghostscript' 'python2' 'podofo' 'boost-libs'
  'desktop-file-utils' 'shared-mime-info')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('7bd3b4a7d6e6262126079847c617b3a25ba8ab06')
+sha1sums=('70685aeb66d1f8f4984125c56f8f6e059af267c3')
 
 install=install
 


[arch-commits] Commit in scribus/trunk (PKGBUILD)

2014-09-22 Thread Gaetan Bisson
Date: Monday, September 22, 2014 @ 20:18:05
  Author: bisson
Revision: 119429

rebuild for podofo-0.9.3-1

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-22 17:00:54 UTC (rev 119428)
+++ PKGBUILD2014-09-22 18:18:05 UTC (rev 119429)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2013-10-26 Thread Gaetan Bisson
Date: Saturday, October 26, 2013 @ 09:42:49
  Author: bisson
Revision: 99232

remove options enforced by newer pacman

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-26 07:42:37 UTC (rev 99231)
+++ PKGBUILD2013-10-26 07:42:49 UTC (rev 99232)
@@ -20,7 +20,6 @@
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
 sha1sums=('30c111762790e4407c13236bbb4b06f04e907f71')
 
-options=('!libtool')
 install=install
 
 prepare() {



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2013-10-07 Thread Gaetan Bisson
Date: Tuesday, October 8, 2013 @ 08:27:35
  Author: bisson
Revision: 98299

FS#37240

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-08 06:09:02 UTC (rev 98298)
+++ PKGBUILD2013-10-08 06:27:35 UTC (rev 98299)
@@ -13,6 +13,7 @@
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('cmake' 'boost' 'mesa')
+optdepends=('tk: scripts based on tkinter')
 depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
  'ghostscript' 'python2' 'podofo' 'boost-libs'
  'desktop-file-utils' 'shared-mime-info')



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2013-08-18 Thread Gaetan Bisson
Date: Monday, August 19, 2013 @ 07:29:42
  Author: bisson
Revision: 95953

fix FS#36426

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-19 02:21:16 UTC (rev 95952)
+++ PKGBUILD2013-08-19 05:29:42 UTC (rev 95953)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
@@ -17,13 +17,13 @@
  'ghostscript' 'python2' 'podofo' 'boost-libs'
  'desktop-file-utils' 'shared-mime-info')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('23d85fcfe0a61ff88cc003639efdbb38d43feb7f')
+sha1sums=('30c111762790e4407c13236bbb4b06f04e907f71')
 
 options=('!libtool')
 install=install
 
 prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}-${pkgver}"
sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i 
scribus.desktop
sed \
-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
@@ -33,7 +33,7 @@
 }
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}/build"
+   cd "${srcdir}/build"
cmake "../${pkgname}-${pkgver}" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
@@ -43,7 +43,7 @@
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}/build"
+   cd "${srcdir}/build"
make DESTDIR="${pkgdir}" install
install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" 
"${pkgdir}/usr/share/applications/scribus.desktop"
 }



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2013-07-30 Thread Gaetan Bisson
Date: Tuesday, July 30, 2013 @ 16:33:53
  Author: bisson
Revision: 94793

upstream update

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-30 14:32:12 UTC (rev 94792)
+++ PKGBUILD2013-07-30 14:33:53 UTC (rev 94793)
@@ -6,24 +6,24 @@
 # Contributor: Ben 
 
 pkgname=scribus
-pkgver=1.4.2
-pkgrel=4
+pkgver=1.4.3
+pkgrel=1
 pkgdesc='Desktop publishing software'
-url="http://www.scribus.net/";
+url='http://www.scribus.net/'
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('cmake' 'boost' 'mesa')
 depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
- 'ghostscript' 'python2' 'aspell' 'podofo' 'boost-libs'
+ 'ghostscript' 'python2' 'podofo' 'boost-libs'
  'desktop-file-utils' 'shared-mime-info')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
+sha1sums=('23d85fcfe0a61ff88cc003639efdbb38d43feb7f')
 
 options=('!libtool')
 install=install
 
 prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}"
sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i 
scribus.desktop
sed \
-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
@@ -33,7 +33,7 @@
 }
 
 build() {
-   cd "${srcdir}/build"
+   cd "${srcdir}/${pkgname}-${pkgver}/build"
cmake "../${pkgname}-${pkgver}" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
@@ -43,7 +43,7 @@
 }
 
 package() {
-   cd "${srcdir}/build"
+   cd "${srcdir}/${pkgname}-${pkgver}/build"
make DESTDIR="${pkgdir}" install
install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" 
"${pkgdir}/usr/share/applications/scribus.desktop"
 }



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2013-07-22 Thread Gaetan Bisson
Date: Monday, July 22, 2013 @ 09:50:10
  Author: bisson
Revision: 191243

rebuild with podofo

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-22 06:31:51 UTC (rev 191242)
+++ PKGBUILD2013-07-22 07:50:10 UTC (rev 191243)
@@ -14,8 +14,8 @@
 arch=('i686' 'x86_64')
 makedepends=('cmake' 'boost' 'mesa')
 depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
- 'ghostscript' 'python2' 'aspell' 'boost-libs'
- 'desktop-file-utils' 'shared-mime-info' 'podofo')
+ 'ghostscript' 'python2' 'aspell' 'podofo' 'boost-libs'
+ 'desktop-file-utils' 'shared-mime-info')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
 sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2013-07-20 Thread Rémy Oudompheng
Date: Saturday, July 20, 2013 @ 19:04:31
  Author: remy
Revision: 191213

Build with libpodofo (FS#32833)

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-20 16:25:03 UTC (rev 191212)
+++ PKGBUILD2013-07-20 17:04:31 UTC (rev 191213)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.4.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Desktop publishing software'
 url="http://www.scribus.net/";
 license=('GPL')
@@ -15,7 +15,7 @@
 makedepends=('cmake' 'boost' 'mesa')
 depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
  'ghostscript' 'python2' 'aspell' 'boost-libs'
- 'desktop-file-utils' 'shared-mime-info')
+ 'desktop-file-utils' 'shared-mime-info' 'podofo')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
 sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 



[arch-commits] Commit in scribus/trunk (PKGBUILD install scribus.install)

2013-07-07 Thread Gaetan Bisson
Date: Sunday, July 7, 2013 @ 12:22:16
  Author: bisson
Revision: 189756

rebuild for boost-1.54.0, general cleanup

Added:
  scribus/trunk/install
(from rev 189749, scribus/trunk/scribus.install)
Modified:
  scribus/trunk/PKGBUILD
Deleted:
  scribus/trunk/scribus.install

-+
 PKGBUILD|   61 +-
 install |   11 +
 scribus.install |   11 -
 3 files changed, 40 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-07 09:05:23 UTC (rev 189755)
+++ PKGBUILD2013-07-07 10:22:16 UTC (rev 189756)
@@ -1,52 +1,49 @@
 # $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Daniel J Griffiths 
 # Contributor: Ronald van Haren 
 # Contributor: tobias 
 # Contributor: Ben 
-# Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
 pkgver=1.4.2
-pkgrel=2
-pkgdesc="A desktop publishing program"
+pkgrel=3
+pkgdesc='Desktop publishing software'
+url="http://www.scribus.net/";
+license=('GPL')
 arch=('i686' 'x86_64')
-url="http://www.scribus.net";
-license=('GPL')
-install=scribus.install
-depends=('libcups>=1.3.11' 'lcms2' 'qt4' 'ghostscript>=8.70' \
- 'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
- 'desktop-file-utils' 'shared-mime-info' \
- 'hyphen' 'aspell' 'boost-libs')
 makedepends=('cmake' 'boost' 'mesa')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
+ 'ghostscript' 'python2' 'aspell' 'boost-libs'
+ 'desktop-file-utils' 'shared-mime-info')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
 sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 
-build() {
-   cd "${srcdir}"
+options=('!libtool')
+install=install
 
-   sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-  -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-   
scribus-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i 
scribus.desktop
+   sed \
+   -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+   -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+   -i scribus/plugins/scriptplugin/{samples,scripts}/*
+   install -d ../build
+}
 
-   mkdir build
-   cd build
-   cmake ../scribus-${pkgver} \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_SKIP_RPATH=ON \
-  -DWANT_CAIRO=1 \
-  -DLIB_SUFFIX=""
+build() {
+   cd "${srcdir}/build"
+   cmake "../${pkgname}-${pkgver}" \
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_SKIP_RPATH=ON \
+   -DLIB_SUFFIX=""
make
 }
 
 package() {
cd "${srcdir}/build"
make DESTDIR="${pkgdir}" install
-
-   # fix icon path in .desktop file
-   sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-  "${srcdir}/scribus-${pkgver}/scribus.desktop"
-
-   install -Dm644 "${srcdir}/scribus-${pkgver}/scribus.desktop" \
-  "${pkgdir}/usr/share/applications/scribus.desktop"
+   install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" 
"${pkgdir}/usr/share/applications/scribus.desktop"
 }

Copied: scribus/trunk/install (from rev 189749, scribus/trunk/scribus.install)
===
--- install (rev 0)
+++ install 2013-07-07 10:22:16 UTC (rev 189756)
@@ -0,0 +1,11 @@
+post_install() {
+   update-mime-database usr/share/mime &> /dev/null
+   update-desktop-database -q
+}
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}

Deleted: scribus.install
===
--- scribus.install 2013-07-07 09:05:23 UTC (rev 189755)
+++ scribus.install 2013-07-07 10:22:16 UTC (rev 189756)
@@ -1,11 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}



[arch-commits] Commit in scribus/trunk (PKGBUILD scribus.install)

2013-02-20 Thread Eric Bélanger
Date: Thursday, February 21, 2013 @ 00:15:57
  Author: eric
Revision: 178368

upgpkg: scribus 1.4.2-2

Replace qt depends with qt4, Replace lcms depends with lcms2, Add mesa 
makedepends, Clean up install scriptlet

Modified:
  scribus/trunk/PKGBUILD
  scribus/trunk/scribus.install

-+
 PKGBUILD|7 +++
 scribus.install |6 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-20 22:58:50 UTC (rev 178367)
+++ PKGBUILD2013-02-20 23:15:57 UTC (rev 178368)
@@ -6,20 +6,19 @@
 
 pkgname=scribus
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 url="http://www.scribus.net";
 license=('GPL')
 install=scribus.install
-depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
+depends=('libcups>=1.3.11' 'lcms2' 'qt4' 'ghostscript>=8.70' \
  'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
  'desktop-file-utils' 'shared-mime-info' \
  'hyphen' 'aspell' 'boost-libs')
-makedepends=('cmake' 'boost')
+makedepends=('cmake' 'boost' 'mesa')
 options=(!libtool)
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('5c2a6bb7107e67a0083e32275bdb1a13')
 sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 
 build() {

Modified: scribus.install
===
--- scribus.install 2013-02-20 22:58:50 UTC (rev 178367)
+++ scribus.install 2013-02-20 23:15:57 UTC (rev 178368)
@@ -1,8 +1,6 @@
-
 post_install() {
-  echo "update desktop mime database..."
-  update-mime-database usr/share/mime > /dev/null 2>&1
-  update-desktop-database -q > /dev/null 2>&1
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 post_upgrade() {
   post_install $1



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2013-01-24 Thread remy
Date: Thursday, January 24, 2013 @ 09:14:02
  Author: remy
Revision: 175911

upgpkg: scribus 1.4.2-1

Add aspell, boost-libs, hyphen to dependencies.

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-23 21:20:09 UTC (rev 175910)
+++ PKGBUILD2013-01-24 08:14:02 UTC (rev 175911)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
@@ -14,23 +14,24 @@
 install=scribus.install
 depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
  'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
- 'desktop-file-utils' 'shared-mime-info')
-makedepends=('cmake')
+ 'desktop-file-utils' 'shared-mime-info' \
+ 'hyphen' 'aspell' 'boost-libs')
+makedepends=('cmake' 'boost')
 options=(!libtool)
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('c79593dc61bc137d9e7968b37d070993')
-sha1sums=('fb48bc492d79abc2275b1903692defe9b3931adf')
+md5sums=('5c2a6bb7107e67a0083e32275bdb1a13')
+sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 
 build() {
cd "${srcdir}"
 
sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
   -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-   Scribus/scribus/plugins/scriptplugin/{samples,scripts}/*
+   
scribus-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
 
mkdir build
cd build
-   cmake ../Scribus \
+   cmake ../scribus-${pkgver} \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_SKIP_RPATH=ON \
@@ -45,8 +46,8 @@
 
# fix icon path in .desktop file
sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-  "${srcdir}/Scribus/scribus.desktop"
+  "${srcdir}/scribus-${pkgver}/scribus.desktop"
 
-   install -Dm644 "${srcdir}/Scribus/scribus.desktop" \
+   install -Dm644 "${srcdir}/scribus-${pkgver}/scribus.desktop" \
   "${pkgdir}/usr/share/applications/scribus.desktop"
 }



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2012-07-31 Thread Rémy Oudompheng
Date: Wednesday, August 1, 2012 @ 02:54:58
  Author: remy
Revision: 164495

upgpkg: scribus 1.4.1-1

Upstream update. Fixes FS#30334.

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-01 06:01:13 UTC (rev 164494)
+++ PKGBUILD2012-08-01 06:54:58 UTC (rev 164495)
@@ -5,8 +5,8 @@
 # Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 url="http://www.scribus.net";
@@ -18,17 +18,19 @@
 makedepends=('cmake')
 options=(!libtool)
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ae19e62399941fb8e868d8e762caf494')
-sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809')
+md5sums=('c79593dc61bc137d9e7968b37d070993')
+sha1sums=('fb48bc492d79abc2275b1903692defe9b3931adf')
 
 build() {
cd "${srcdir}"
+
sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
   -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-   
${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
+   Scribus/scribus/plugins/scriptplugin/{samples,scripts}/*
+
mkdir build
cd build
-   cmake ../${pkgname}-${pkgver} \
+   cmake ../Scribus \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_SKIP_RPATH=ON \
@@ -43,8 +45,8 @@
 
# fix icon path in .desktop file
sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-  "${srcdir}/${pkgname}-${pkgver}/scribus.desktop"
+  "${srcdir}/Scribus/scribus.desktop"
 
-   install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \
+   install -Dm644 "${srcdir}/Scribus/scribus.desktop" \
   "${pkgdir}/usr/share/applications/scribus.desktop"
 }



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2012-01-27 Thread Eric Bélanger
Date: Friday, January 27, 2012 @ 22:27:19
  Author: eric
Revision: 147754

upgpkg: scribus 1.4.0-2

Rebuild against libpng 1.5 and libtiff 4.0, Fix python scripts

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-27 22:59:35 UTC (rev 147753)
+++ PKGBUILD2012-01-28 03:27:19 UTC (rev 147754)
@@ -6,7 +6,7 @@
 
 pkgname=scribus
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 url="http://www.scribus.net";
@@ -23,7 +23,9 @@
 
 build() {
cd "${srcdir}"
-   sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' 
${pkgname}-${pkgver}/scribus/plugins/scriptplugin/scripts/ColorChart.py
+   sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+  -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+   
${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2012-01-19 Thread Rémy Oudompheng
Date: Friday, January 20, 2012 @ 00:57:27
  Author: remy
Revision: 146994

upgpkg: scribus 1.4.0-1

Upstream update.

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 05:40:57 UTC (rev 146993)
+++ PKGBUILD2012-01-20 05:57:27 UTC (rev 146994)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
-pkgver=1.3.9
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
@@ -16,10 +16,10 @@
  'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
  'desktop-file-utils' 'shared-mime-info')
 makedepends=('cmake')
-options=(!libtool !makeflags)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a54dbf2e10cd88d683d0d34565d29378')
-sha1sums=('86bc4db2d8fbb91fe94f8535327991e9128c5862')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('ae19e62399941fb8e868d8e762caf494')
+sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809')
 
 build() {
cd "${srcdir}"



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2010-12-08 Thread Daniel Griffiths
Date: Wednesday, December 8, 2010 @ 13:20:12
  Author: dgriffiths
Revision: 102618

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-08 17:45:24 UTC (rev 102617)
+++ PKGBUILD2010-12-08 18:20:12 UTC (rev 102618)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
-pkgver=1.3.8
+pkgver=1.3.9
 pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
@@ -18,8 +18,8 @@
 makedepends=('cmake')
 options=(!libtool !makeflags)
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('660b946ea3ba19e894fb5701832a6b54')
-sha1sums=('be54c93a8da56d9efe5e4d46c5cebebc36104670')
+md5sums=('a54dbf2e10cd88d683d0d34565d29378')
+sha1sums=('86bc4db2d8fbb91fe94f8535327991e9128c5862')
 
 build() {
cd "${srcdir}"



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2010-09-11 Thread Eric Bélanger
Date: Saturday, September 11, 2010 @ 21:28:09
  Author: eric
Revision: 90493

upgpkg: scribus 1.3.8-1
Upstream update, Built for python2

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-12 01:24:31 UTC (rev 90492)
+++ PKGBUILD2010-09-12 01:28:09 UTC (rev 90493)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
-pkgver=1.3.7
+pkgver=1.3.8
 pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
@@ -13,15 +13,17 @@
 license=('GPL')
 install=scribus.install
 depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
- 'libart-lgpl>=2.3.20' 'python>=2.6.2' 'libxml2>=2.7.3' 'cairo' \
+ 'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
  'desktop-file-utils' 'shared-mime-info')
 makedepends=('cmake')
 options=(!libtool !makeflags)
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2c486389172c053ff4da38960e412690')
+md5sums=('660b946ea3ba19e894fb5701832a6b54')
+sha1sums=('be54c93a8da56d9efe5e4d46c5cebebc36104670')
 
 build() {
-   cd ${srcdir}
+   cd "${srcdir}"
+   sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' 
${pkgname}-${pkgver}/scribus/plugins/scriptplugin/scripts/ColorChart.py
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -30,17 +32,17 @@
   -DCMAKE_SKIP_RPATH=ON \
   -DWANT_CAIRO=1 \
   -DLIB_SUFFIX=""
-   make || return 1
+   make
 }
 
 package() {
-   cd ${srcdir}/build
-   make DESTDIR=${pkgdir} install
+   cd "${srcdir}/build"
+   make DESTDIR="${pkgdir}" install
 
# fix icon path in .desktop file
sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-  ${srcdir}/${pkgname}-${pkgver}/scribus.desktop
+  "${srcdir}/${pkgname}-${pkgver}/scribus.desktop"
 
-   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/scribus.desktop \
-  ${pkgdir}/usr/share/applications/scribus.desktop
+   install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \
+  "${pkgdir}/usr/share/applications/scribus.desktop"
 }



[arch-commits] Commit in scribus/trunk (PKGBUILD scribus.install)

2010-06-30 Thread Eric Bélanger
Date: Wednesday, June 30, 2010 @ 23:49:29
  Author: eric
Revision: 84587

Made .install script quiet, Added svn Id tag

Modified:
  scribus/trunk/PKGBUILD
  scribus/trunk/scribus.install

-+
 PKGBUILD|1 +
 scribus.install |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-01 02:53:34 UTC (rev 84586)
+++ PKGBUILD2010-07-01 03:49:29 UTC (rev 84587)
@@ -1,3 +1,4 @@
+# $Id$
 # Contributor: Ronald van Haren 
 # Contributor: tobias 
 # Contributor: Ben 

Modified: scribus.install
===
--- scribus.install 2010-07-01 02:53:34 UTC (rev 84586)
+++ scribus.install 2010-07-01 03:49:29 UTC (rev 84587)
@@ -1,8 +1,8 @@
 
 post_install() {
   echo "update desktop mime database..."
-  update-mime-database usr/share/mime &2>/dev/null
-  update-desktop-database -q &2>/dev/null
+  update-mime-database usr/share/mime > /dev/null 2>&1
+  update-desktop-database -q > /dev/null 2>&1
 }
 post_upgrade() {
   post_install $1



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2010-06-30 Thread Daniel Griffiths
Date: Wednesday, June 30, 2010 @ 17:16:27
  Author: dgriffiths
Revision: 84545

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-30 19:20:25 UTC (rev 84544)
+++ PKGBUILD2010-06-30 21:16:27 UTC (rev 84545)
@@ -4,8 +4,8 @@
 # Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
-pkgver=1.3.6
-pkgrel=2
+pkgver=1.3.7
+pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 url="http://www.scribus.net";
@@ -17,7 +17,7 @@
 makedepends=('cmake')
 options=(!libtool !makeflags)
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2d653c8371d198b5d8321e9ba5e0142d')
+md5sums=('2c486389172c053ff4da38960e412690')
 
 build() {
cd ${srcdir}



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2010-04-29 Thread Daniel Griffiths
Date: Thursday, April 29, 2010 @ 22:29:10
  Author: dgriffiths
Revision: 79030

FS#19265

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-30 02:28:19 UTC (rev 79029)
+++ PKGBUILD2010-04-30 02:29:10 UTC (rev 79030)
@@ -5,7 +5,7 @@
 
 pkgname=scribus
 pkgver=1.3.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 url="http://www.scribus.net";
@@ -17,7 +17,7 @@
 makedepends=('cmake')
 options=(!libtool !makeflags)
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4c69d24aac3dcc806f34b8c13668f83b')
+md5sums=('2d653c8371d198b5d8321e9ba5e0142d')
 
 build() {
cd ${srcdir}



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2010-03-17 Thread Daniel Griffiths
Date: Wednesday, March 17, 2010 @ 03:01:45
  Author: dgriffiths
Revision: 72500

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-17 04:40:40 UTC (rev 72499)
+++ PKGBUILD2010-03-17 07:01:45 UTC (rev 72500)
@@ -4,8 +4,8 @@
 # Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
-pkgver=1.3.5.1
-pkgrel=2
+pkgver=1.3.6
+pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 url="http://www.scribus.net";
@@ -17,7 +17,7 @@
 makedepends=('cmake')
 options=(!libtool !makeflags)
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4cadca0c780491ad61dc2d815776f10b')
+md5sums=('4c69d24aac3dcc806f34b8c13668f83b')
 
 build() {
cd ${srcdir}



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2010-02-09 Thread Daniel Griffiths
Date: Tuesday, February 9, 2010 @ 16:03:05
  Author: dgriffiths
Revision: 67942

Move to splitpkg format

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   42 +++---
 1 file changed, 23 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-09 21:00:21 UTC (rev 67941)
+++ PKGBUILD2010-02-09 21:03:05 UTC (rev 67942)
@@ -1,15 +1,15 @@
-# $Id$
-# Maintainer: Ronald van Haren 
+# Contributor: Ronald van Haren 
 # Contributor: tobias 
 # Contributor: Ben 
+# Maintainer: Daniel J Griffiths 
 
 pkgname=scribus
 pkgver=1.3.5.1
 pkgrel=2
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
+url="http://www.scribus.net";
 license=('GPL')
-url="http://www.scribus.net";
 install=scribus.install
 depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
  'libart-lgpl>=2.3.20' 'python>=2.6.2' 'libxml2>=2.7.3' 'cairo' \
@@ -20,22 +20,26 @@
 md5sums=('4cadca0c780491ad61dc2d815776f10b')
 
 build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
--DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_SKIP_RPATH=ON \
--DWANT_CAIRO=1 \
--DLIB_SUFFIX=""
-  make || return 1
-  make DESTDIR=${pkgdir} install
+   cd ${srcdir}
+   mkdir build
+   cd build
+   cmake ../${pkgname}-${pkgver} \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_SKIP_RPATH=ON \
+  -DWANT_CAIRO=1 \
+  -DLIB_SUFFIX=""
+   make || return 1
+}
 
-  # fix icon path in .desktop file
-  sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-${srcdir}/${pkgname}-${pkgver}/scribus.desktop
+package() {
+   cd ${srcdir}/build
+   make DESTDIR=${pkgdir} install
 
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/scribus.desktop \
-${pkgdir}/usr/share/applications/scribus.desktop
+   # fix icon path in .desktop file
+   sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
+  ${srcdir}/${pkgname}-${pkgver}/scribus.desktop
+
+   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/scribus.desktop \
+  ${pkgdir}/usr/share/applications/scribus.desktop
 }



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2010-01-22 Thread Pierre Schmitz
Date: Friday, January 22, 2010 @ 09:02:29
  Author: pierre
Revision: 64860

upgpkg: scribus 1.3.5.1-2
jpng rebuild

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-22 13:47:51 UTC (rev 64859)
+++ PKGBUILD2010-01-22 14:02:29 UTC (rev 64860)
@@ -5,13 +5,13 @@
 
 pkgname=scribus
 pkgver=1.3.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.scribus.net";
 install=scribus.install
-depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt>=4.5.2' 'ghostscript>=8.70' \
+depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
  'libart-lgpl>=2.3.20' 'python>=2.6.2' 'libxml2>=2.7.3' 'cairo' \
  'desktop-file-utils' 'shared-mime-info')
 makedepends=('cmake')



[arch-commits] Commit in scribus/trunk (PKGBUILD)

2010-01-17 Thread Andrea Scarpino
Date: Sunday, January 17, 2010 @ 14:10:47
  Author: andrea
Revision: 63535

cleanup build

Modified:
  scribus/trunk/PKGBUILD

--+
 PKGBUILD |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-17 19:10:29 UTC (rev 63534)
+++ PKGBUILD2010-01-17 19:10:47 UTC (rev 63535)
@@ -16,22 +16,26 @@
  'desktop-file-utils' 'shared-mime-info')
 makedepends=('cmake')
 options=(!libtool !makeflags)
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('4cadca0c780491ad61dc2d815776f10b')
 
 build() {
-  cd ${srcdir}/scribus-${pkgver}
-  cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_SKIP_RPATH=ON \
-  -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--as-needed' \
- -DWANT_CAIRO=1 -DLIB_SUFFIX="" 
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_SKIP_RPATH=ON \
+-DWANT_CAIRO=1 \
+-DLIB_SUFFIX=""
   make || return 1
   make DESTDIR=${pkgdir} install
 
   # fix icon path in .desktop file
-  sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' 
scribus.desktop
+  sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
+${srcdir}/${pkgname}-${pkgver}/scribus.desktop
 
-  install -Dm644 scribus.desktop \
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/scribus.desktop \
 ${pkgdir}/usr/share/applications/scribus.desktop
 }